Merge commit '4f3db5d3418a24f3b90422e98ad75388052c4284'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 22:13:19 +0000 (23:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 22:13:37 +0000 (23:13 +0100)
* commit '4f3db5d3418a24f3b90422e98ad75388052c4284':
  movenc: allow muxing HEVC in MODE_MP4.

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

Simple merge
Simple merge