Mercurial > libavformat.hg

diff mov.c @ 3022:800db1ceafc6 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow the user to select which codec out of several in stsd he wants.
author michael
date Wed, 06 Feb 2008 01:51:32 +0000
parents 4b6a9b61e9dd
children 6acb70995546
line wrap: on
line diff
--- a/mov.c	Tue Feb 05 01:16:47 2008 +0000
+++ b/mov.c	Wed Feb 06 01:51:32 2008 +0000
@@ -600,7 +600,10 @@
         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 */