diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-14 17:11:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-20 22:02:28 +0100 |
| commit | b5469fec6a2114b3a73d71fd50a033da7005d7d6 (patch) | |
| tree | 5910e5bd3fb78af7675bd0aa6a87ab9857963815 /libavformat/movenc.c | |
| parent | 864a7e73b9604f3db1dd58f4580a1c8f05219ea4 (diff) | |
| download | ffmpeg-b5469fec6a2114b3a73d71fd50a033da7005d7d6.tar.gz | |
movenc: hotfix, dont store fiel for h264 / mpeg4-asp / dnxhd
Other software does not store it in this case, and the information
is provided by the codec stream
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 405cc0d9052079307b2b4188c396ae30c8e9108b)
Conflicts:
tests/ref/lavf/mov
tests/ref/seek/lavf_mov
tests/ref/vsynth/vsynth1-dnxhd-1080i
tests/ref/vsynth/vsynth1-mpeg4
tests/ref/vsynth/vsynth2-dnxhd-1080i
tests/ref/vsynth/vsynth2-mpeg4
Diffstat (limited to 'libavformat/movenc.c')
| -rw-r--r-- | libavformat/movenc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 9e345d5e40..d59580db91 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1083,8 +1083,11 @@ static int mov_write_video_tag(AVIOContext *pb, MOVTrack *track) else if (track->vos_len > 0) mov_write_glbl_tag(pb, track); - if (track->enc->field_order != AV_FIELD_UNKNOWN) - mov_write_fiel_tag(pb, track); + if (track->enc->codec_id != CODEC_ID_H264 && + track->enc->codec_id != CODEC_ID_MPEG4 && + track->enc->codec_id != CODEC_ID_DNXHD) + if (track->enc->field_order != AV_FIELD_UNKNOWN) + mov_write_fiel_tag(pb, track); if (track->enc->sample_aspect_ratio.den && track->enc->sample_aspect_ratio.num && track->enc->sample_aspect_ratio.den != track->enc->sample_aspect_ratio.num) { |