[FFmpeg-devel] [PATCH] MJPEG: emulate EOI also on two consecutive SOI.

Michael Niedermayer michaelni at gmx.at
Sat Aug 27 18:52:21 CEST 2011


On Sat, Aug 27, 2011 at 02:43:04PM +0200, Reimar Döffinger wrote:
> Fixes issue #362.
> 
> Signed-off-by: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
> ---
>  libavcodec/mjpegdec.c |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)
> 
> diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
> index 6331e3d..57ce821 100644
> --- a/libavcodec/mjpegdec.c
> +++ b/libavcodec/mjpegdec.c
> @@ -1430,6 +1430,10 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx,
>  
>                      s->restart_count = 0;
>                      /* nothing to do on SOI */
> +                    if (s->got_picture) {
> +                        av_log(avctx, AV_LOG_WARNING, "EOI missing, emulating\n");
> +                        goto eoi_parser;

should that not jump to 3 lines earlier to emulate EOI fully ?

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

I hate to see young programmers poisoned by the kind of thinking
Ulrich Drepper puts forward since it is simply too narrow -- Roman Shaposhnik
-------------- 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/20110827/00732ce4/attachment.asc>


More information about the ffmpeg-devel mailing list