diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-30 21:36:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-30 21:47:58 +0200 |
| commit | cfcb9f5e3628fc8e768836cd4b9b377c24221cf9 (patch) | |
| tree | 8d232eb8465d8157f48ed34e5f08d0ba8d04182d /libavcodec/arm/fmtconvert_vfp.S | |
| parent | 4ff0c61ba80016bdda4ca3002c381a9f2f3cc8c8 (diff) | |
| parent | e95c7a61852cc5b9ce5445ff034b87553e61958a (diff) | |
| download | ffmpeg-cfcb9f5e3628fc8e768836cd4b9b377c24221cf9.tar.gz | |
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>
Diffstat (limited to 'libavcodec/arm/fmtconvert_vfp.S')
0 files changed, 0 insertions, 0 deletions