[FFmpeg-devel] [PATCH] oggparseskeleton: Fix fisbone header parsing

[Michael Niedermayer]

On Sat, Jul 06, 2013 at 04:34:13AM -0300, James Almer wrote:
> Remove the first packet size check. The Skeleton EOS page contains a single packet of length
> zero.
> 
> start_granule should be applied to the stream referenced in the fisbone packet, not to the
> Skeleton stream.
> This was broken in d1f05dd18375f2f8e68372edee11436927e43ba8 and produced bogus warnings about 
> multiple fisbone in the same stream on files with more than one stream.
> Also replace avpriv_report_missing_feature() with a normal av_log() call, since there should
> not be more than one fisbone for a given stream.
> 
> Signed-off-by: James Almer <jamrial at gmail.com>
> ---
>  libavformat/oggparseskeleton.c | 13 +++++++------
>  1 file changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/libavformat/oggparseskeleton.c b/libavformat/oggparseskeleton.c
> index 307387d..56f5713 100644
> --- a/libavformat/oggparseskeleton.c
> +++ b/libavformat/oggparseskeleton.c

> @@ -37,9 +37,6 @@ static int skeleton_header(AVFormatContext *s, int idx)
>      strcpy(st->codec->codec_name, "skeleton");
>      st->codec->codec_type = AVMEDIA_TYPE_DATA;
>  
> -    if (os->psize < 8)
> -        return -1;
> -
>      if (!strncmp(buf, "fishead", 8)) {
>          if (os->psize < 64)
>              return -1;

why?
this is supposed to check if buf contains 8 bytes for the strncmp

rest of the patch split & applied

thanks

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The misfortune of the wise is better than the prosperity of the fool.
-- Epicurus
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20130706/3c8b0c18/attachment.asc>