[FFmpeg-devel] [PATCH 2/3] id3v2: skip encrypted/compressed frames

Anton Khirnov anton
Tue Dec 7 09:30:27 CET 2010


On Mon, Dec 06, 2010 at 09:48:25PM +0100, Michael Niedermayer wrote:
> On Mon, Dec 06, 2010 at 09:33:08AM +0100, Anton Khirnov wrote:
> > ---
> >  libavformat/id3v2.c |    5 ++++-
> >  1 files changed, 4 insertions(+), 1 deletions(-)
> > 
> > diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c
> > index 4115f8f..2af1b03 100644
> > --- a/libavformat/id3v2.c
> > +++ b/libavformat/id3v2.c
> > @@ -229,7 +229,10 @@ void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags)
> >              tlen -= 4;
> >          }
> >  
> > -        if (tag[0] == 'T') {
> > +        if (tflags & (ID3v2_FLAG_ENCRYPTION | ID3v2_FLAG_COMPRESSION)) {
> > +            av_log(s, AV_LOG_WARNING, "Skipping encrypted/compressed ID3v2 frame %s.\n", tag);
> > +            url_fskip(s->pb, tlen);
> > +        } else if (tag[0] == 'T') {
> 
> lgtm
> 
applied

-- 
Anton Khirnov
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20101207/42c13196/attachment.pgp>



More information about the ffmpeg-devel mailing list