[FFmpeg-devel] [PATCH]Do not fail for valid PICT files

Michael Niedermayer michaelni at gmx.at
Thu May 14 13:47:54 CEST 2015


On Thu, May 14, 2015 at 12:28:13PM +0200, Carl Eugen Hoyos wrote:
> Hi!
> 
> Attached patch fixes reading valid pict files with non-zero user data.
> https://developer.apple.com/legacy/library/documentation/mac/QuickDraw/QuickDraw-334.html
> 
> Please comment, Carl Eugen

>  qdrw.c |    5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> edf25620818c022655ed281d4e7d614459d56df3  patchqdrw.diff
> diff --git a/libavcodec/qdrw.c b/libavcodec/qdrw.c
> index 1c3244b..6ec35c6 100644
> --- a/libavcodec/qdrw.c
> +++ b/libavcodec/qdrw.c
> @@ -124,9 +124,8 @@ static int decode_frame(AVCodecContext *avctx,
>      int w, h, ret;
>  
>      bytestream2_init(&gbc, avpkt->data, avpkt->size);
> -    while (   bytestream2_get_bytes_left(&gbc) >= 552
> -           && (   !AV_RB16(&avpkt->data[bytestream2_tell(&gbc)+6])
> -               || !AV_RB16(&avpkt->data[bytestream2_tell(&gbc)+8])))
> +    if (   bytestream2_get_bytes_left(&gbc) >= 552
> +           && AV_RB32(&avpkt->data[522]) == 0x001102FF)

This wont work with files that have a different version

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The bravest are surely those who have the clearest vision
of what is before them, glory and danger alike, and yet
notwithstanding go out to meet it. -- Thucydides
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20150514/cff0b5eb/attachment.asc>


More information about the ffmpeg-devel mailing list