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

[Baptiste Coudurier]

Hi,

michael wrote:
> Author: michael
> Date: Sat Jan 26 20:50:04 2008
> New Revision: 11621
> 
> Log:
> Select non jpeg if there are multiple substreams.
> 
> 
> Modified:
>    trunk/libavformat/mov.c
> 
> Modified: trunk/libavformat/mov.c
> ==============================================================================
> --- trunk/libavformat/mov.c	(original)
> +++ trunk/libavformat/mov.c	Sat Jan 26 20:50:04 2008
> @@ -600,8 +600,10 @@ static int mov_read_stsd(MOVContext *c, 
>          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;
>          }

This is hackish, and Im against it. You will have to add all image types
(png and so on). The proper solution must be implemented, and adding
hacks won't help.

-- 
Baptiste COUDURIER                              GnuPG Key Id: 0x5C1ABAAA
SMARTJOG S.A.                                    http://www.smartjog.com
Key fingerprint                 8D77134D20CC9220201FC5DB0AC9325C5C1ABAAA
Phone: +33 1 49966312