[SCM] libav/experimental: fix got_picture output
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:29:57 UTC 2013
The following commit has been merged in the experimental branch:
commit 9d02db7a176e41eeb1ef547143b9bcfe005dae9e
Author: Fabrice Bellard <fabrice at bellard.org>
Date: Wed Aug 15 13:10:39 2001 +0000
fix got_picture output
Originally committed as revision 99 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c
index 7410583..1103e11 100644
--- a/libavcodec/mjpeg.c
+++ b/libavcodec/mjpeg.c
@@ -875,11 +875,11 @@ static int mjpeg_decode_frame(AVCodecContext *avctx,
int len, code, start_code, input_size, i;
AVPicture *picture = data;
+ *data_size = 0;
+
/* no supplementary picture */
- if (buf_size == 0) {
- *data_size = 0;
+ if (buf_size == 0)
return 0;
- }
buf_ptr = buf;
buf_end = buf + buf_size;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list