diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-27 18:57:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-13 01:28:43 +0100 |
| commit | 72d44f15834af68e2620a7051493359d7ee5b2c3 (patch) | |
| tree | 63b7484e073a126b9d77ef94780611d6de2fb733 /libavformat/movenc.c | |
| parent | 11ed7ec092d33511376cffdcb232bfd1f3f56dd7 (diff) | |
| download | ffmpeg-72d44f15834af68e2620a7051493359d7ee5b2c3.tar.gz | |
mvformat/movenc: fix IMX
fixes Ticket3351
Tested-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/movenc.c')
| -rw-r--r-- | libavformat/movenc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index e90636972d..954b208dcd 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -918,11 +918,14 @@ static AVRational find_fps(AVFormatContext *s, AVStream *st) static int mov_get_mpeg2_xdcam_codec_tag(AVFormatContext *s, MOVTrack *track) { - int tag = MKTAG('m', '2', 'v', '1'); //fallback tag + int tag = track->enc->codec_tag; int interlaced = track->enc->field_order > AV_FIELD_PROGRESSIVE; AVStream *st = track->st; int rate = av_q2d(find_fps(s, st)); + if (!tag) + tag = MKTAG('m', '2', 'v', '1'); //fallback tag + if (track->enc->pix_fmt == AV_PIX_FMT_YUV420P) { if (track->enc->width == 1280 && track->enc->height == 720) { if (!interlaced) { |