[FFmpeg-cvslog] mvformat/movenc: fix IMX

[Michael Niedermayer]

ffmpeg | branch: release/2.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 27 18:57:52 2014 +0100| [c7a854af19019f57ed1fb0c2e65e9e0249b5a78c] | committer: Carl Eugen Hoyos

mvformat/movenc: fix IMX

fixes Ticket3351

Tested-by: carl
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 72d44f15834af68e2620a7051493359d7ee5b2c3)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c7a854af19019f57ed1fb0c2e65e9e0249b5a78c
---

 libavformat/movenc.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index cfb73d7..c1ee3ea 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -899,11 +899,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) {