Merge commit 'ea3309eba715e83027e8ece4a226e39a4bf2a6ce' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Mar 2014 10:47:51 +0000 (11:47 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Mar 2014 10:47:51 +0000 (11:47 +0100)
* commit 'ea3309eba715e83027e8ece4a226e39a4bf2a6ce':
  movenc: use 'hev1' tag for HEVC in MODE_MOV.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/isom.c

Simple merge