diff options
| author | Fabrice Bellard <fabrice@bellard.org> | 2001-08-08 22:11:48 +0000 |
|---|---|---|
| committer | Fabrice Bellard <fabrice@bellard.org> | 2001-08-08 22:11:48 +0000 |
| commit | 486171d7ba0aec9d7c01a31093a81d7ffeb67383 (patch) | |
| tree | 4a2ef35c625c6a83e3e0d40316d7eb2e667e70e9 | |
| parent | 425dddb7f13fed36cd840de346c80ad97804b50c (diff) | |
| download | ffmpeg-486171d7ba0aec9d7c01a31093a81d7ffeb67383.tar.gz | |
return dummy quality to avoid bug in -sameq case - forgot emms in error case
Originally committed as revision 60 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/mjpeg.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c index 97a9501f06..a183bb5b71 100644 --- a/libavcodec/mjpeg.c +++ b/libavcodec/mjpeg.c @@ -704,7 +704,7 @@ static int decode_block(MJpegDecodeContext *s, DCTELEM *block, static int mjpeg_decode_sos(MJpegDecodeContext *s, UINT8 *buf, int buf_size) { - int len, nb_components, i, j, n, h, v; + int len, nb_components, i, j, n, h, v, ret; int mb_width, mb_height, mb_x, mb_y, vmax, hmax, index, id; int comp_index[4]; int dc_index[4]; @@ -781,7 +781,8 @@ static int mjpeg_decode_sos(MJpegDecodeContext *s, dc_index[i], ac_index[i], s->quant_index[c]) < 0) { dprintf("error %d %d\n", mb_y, mb_x); - return -1; + ret = -1; + goto the_end; } ff_idct (s->block); ptr = s->current_picture[c] + @@ -796,8 +797,10 @@ static int mjpeg_decode_sos(MJpegDecodeContext *s, } } } + ret = 0; + the_end: emms_c(); - return 0; + return ret; } /* return the 8 bit start code value and update the search @@ -912,6 +915,9 @@ static int mjpeg_decode_frame(AVCodecContext *avctx, avctx->pix_fmt = PIX_FMT_YUV420P; break; } + /* dummy quality */ + /* XXX: infer it with matrix */ + avctx->quality = 3; goto the_end; } break; |