summaryrefslogtreecommitdiff
path: root/src/libffmpeg/libavcodec/mjpeg.c
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2004-05-30 19:24:17 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2004-05-30 19:24:17 +0000
commitdf5fbeb013e70f14090cec1998a5f923d6713a1d (patch)
treede31c29919f53b88f27bdb7add18706b1b51ddcc /src/libffmpeg/libavcodec/mjpeg.c
parent26de73d1e48ab23af83e352cdc6e9eac41bf8c3b (diff)
downloadxine-lib-df5fbeb013e70f14090cec1998a5f923d6713a1d.tar.gz
xine-lib-df5fbeb013e70f14090cec1998a5f923d6713a1d.tar.bz2
merge ffmpeg to fix compiler warnings
CVS patchset: 6612 CVS date: 2004/05/30 19:24:17
Diffstat (limited to 'src/libffmpeg/libavcodec/mjpeg.c')
-rw-r--r--src/libffmpeg/libavcodec/mjpeg.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/libffmpeg/libavcodec/mjpeg.c b/src/libffmpeg/libavcodec/mjpeg.c
index 78a620fd3..4e2305aef 100644
--- a/src/libffmpeg/libavcodec/mjpeg.c
+++ b/src/libffmpeg/libavcodec/mjpeg.c
@@ -1724,8 +1724,6 @@ static int mjpeg_decode_frame(AVCodecContext *avctx,
int start_code;
AVFrame *picture = data;
- *data_size = 0;
-
/* no supplementary picture */
if (buf_size == 0)
return 0;
@@ -1902,8 +1900,6 @@ static int mjpegb_decode_frame(AVCodecContext *avctx,
uint32_t dqt_offs, dht_offs, sof_offs, sos_offs, second_field_offs;
uint32_t field_size;
- *data_size = 0;
-
/* no supplementary picture */
if (buf_size == 0)
return 0;
@@ -2015,8 +2011,6 @@ static int sp5x_decode_frame(AVCodecContext *avctx,
uint8_t *buf_ptr, *buf_end, *recoded;
int i = 0, j = 0;
- *data_size = 0;
-
/* no supplementary picture */
if (buf_size == 0)
return 0;