diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-27 18:57:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-15 02:42:11 +0100 |
| commit | 242df26b44409e0809014562986e88a5746b8918 (patch) | |
| tree | 537929e93f3b885e9b048624ede9bcc4a9af0e1e | |
| parent | 46c2dba20e09024a93cf5dabf8ac688a7c944427 (diff) | |
| download | ffmpeg-242df26b44409e0809014562986e88a5746b8918.tar.gz | |
mvformat/movenc: fix IMX
fixes Ticket3351
Tested-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 72d44f15834af68e2620a7051493359d7ee5b2c3)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -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 b917a59fb5..ce7ca6f35b 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) { |