[SCM] libav/experimental: Select non jpeg if there are multiple substreams.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 0bc4728e3b5e000682c7263419df4593d165eab7
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sat Jan 26 19:50:04 2008 +0000

    Select non jpeg if there are multiple substreams.
    
    Originally committed as revision 11621 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 2da510f..bb9b3f6 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -600,8 +600,10 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
         get_be16(pb); /* reserved */
         get_be16(pb); /* index */
 
-        if (st->codec->codec_tag) {
-            /* multiple fourcc, just skip for now */
+        if (st->codec->codec_tag && 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 */
             url_fskip(pb, size - (url_ftell(pb) - start_pos));
             continue;
         }

-- 
Libav/FFmpeg packaging