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)
commit9563e67e07590501701a88134bb886a532933949
tree124fd47fc71507ce6f71ad5246f537c32b7e3750
parent5d5e2bd86242506a5af4b290b72e1c52f62f7fb6
parent4f3db5d3418a24f3b90422e98ad75388052c4284
Merge commit '4f3db5d3418a24f3b90422e98ad75388052c4284'

* commit '4f3db5d3418a24f3b90422e98ad75388052c4284':
  movenc: allow muxing HEVC in MODE_MP4.

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