Merge commit 'e95c7a61852cc5b9ce5445ff034b87553e61958a'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jun 2015 19:36:16 +0000 (21:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jun 2015 19:47:58 +0000 (21:47 +0200)
commitcfcb9f5e3628fc8e768836cd4b9b377c24221cf9
tree8d232eb8465d8157f48ed34e5f08d0ba8d04182d
parent4ff0c61ba80016bdda4ca3002c381a9f2f3cc8c8
parente95c7a61852cc5b9ce5445ff034b87553e61958a
Merge commit 'e95c7a61852cc5b9ce5445ff034b87553e61958a'

* commit 'e95c7a61852cc5b9ce5445ff034b87553e61958a':
  mov: Preserve the metadata even when bit-exactness is requested

Conflicts:
libavformat/movenc.c
tests/ref/vsynth/vsynth1-mpeg4
tests/ref/vsynth/vsynth2-mpeg4

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