[FFmpeg-cvslog] r11873 - trunk/libavformat/mov.c

[michael]

Author: michael
Date: Wed Feb  6 02:51:32 2008
New Revision: 11873

Log:
Allow the user to select which codec out of several in stsd he wants.


Modified:
   trunk/libavformat/mov.c

Modified: trunk/libavformat/mov.c
==============================================================================
--- trunk/libavformat/mov.c	(original)
+++ trunk/libavformat/mov.c	Wed Feb  6 02:51:32 2008
@@ -600,7 +600,10 @@ static int mov_read_stsd(MOVContext *c, 
         get_be16(pb); /* reserved */
         get_be16(pb); /* index */
 
-        if (st->codec->codec_tag && st->codec->codec_tag != MKTAG('j', 'p', 'e', 'g')) {
+        if (st->codec->codec_tag &&
+            (c->fc->video_codec_id ? codec_get_id(codec_movvideo_tags, format) != c->fc->video_codec_id
+                                   : st->codec->codec_tag != MKTAG('j', 'p', 'e', 'g'))
+           ){
             /* multiple fourcc, we skip jpeg, this isnt correct, we should export it as
                seperate AVStream but this needs a few changes in the mov demuxer, patch
                welcome */