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

[Baptiste Coudurier]

Hi,

michael wrote:
> Author: michael
> Date: Sat Jan 26 23:57:53 2008
> New Revision: 11627
> 
> Log:
> Set subtitle codec id correctly, i hope this doesnt break anything.
> 
> 
> Modified:
>    trunk/libavformat/mov.c
> 
> Modified: trunk/libavformat/mov.c
> ==============================================================================
> --- trunk/libavformat/mov.c	(original)
> +++ trunk/libavformat/mov.c	Sat Jan 26 23:57:53 2008
> @@ -233,7 +233,6 @@ static int mov_read_hdlr(MOVContext *c, 
>          st->codec->codec_id = CODEC_ID_MP2;
>      else if(type == MKTAG('s', 'u', 'b', 'p')) {
>          st->codec->codec_type = CODEC_TYPE_SUBTITLE;
> -        st->codec->codec_id = CODEC_ID_DVD_SUBTITLE;
>      }
>      get_be32(pb); /* component  manufacture */
>      get_be32(pb); /* component flags */
> @@ -788,6 +787,8 @@ static int mov_read_stsd(MOVContext *c, 
>                  st->codec->bits_per_sample = bits_per_sample;
>                  sc->sample_size = (bits_per_sample >> 3) * st->codec->channels;
>              }
> +        } else if(st->codec->codec_type==CODEC_TYPE_SUBTITLE){
> +            st->codec->codec_id= id;
>          } else {
>              /* other codec type, just skip (rtp, mp4s, tmcd ...) */
>              url_fskip(pb, size - (url_ftell(pb) - start_pos));

This 'subp' media handler is the hackish way for nero to wrap dvd
subtitle, I don't think poluting objectype id is a good solution since I
removed the same standard one day ago.

Does the play way with the old way to set codec id ? If so, I'd prefer
to revert the commit.

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