diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 12:32:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 12:42:10 +0100 |
| commit | 639303867640d1880fad675472bc47e9c95f96c7 (patch) | |
| tree | b8f3de370c8d29bc6498b58a250fbdab375f91b4 | |
| parent | 2fade10cb0c53e6b2a663d8ce0566ba7c61013cf (diff) | |
| parent | e2274aa555f023e4f4e4819bf29b2d7e0adec7d5 (diff) | |
| download | ffmpeg-639303867640d1880fad675472bc47e9c95f96c7.tar.gz | |
Merge commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5'
* commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5':
mjpegdec: use the AVFrame API properly.
Conflicts:
libavcodec/mjpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mjpegdec.c | 18 | ||||
| -rw-r--r-- | libavcodec/mjpegdec.h | 2 |
2 files changed, 13 insertions, 7 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 9bf94b7b9d..187f32595a 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -87,9 +87,12 @@ av_cold int ff_mjpeg_decode_init(AVCodecContext *avctx) { MJpegDecodeContext *s = avctx->priv_data; - if (!s->picture_ptr) - s->picture_ptr = &s->picture; - avcodec_get_frame_defaults(&s->picture); + if (!s->picture_ptr) { + s->picture = av_frame_alloc(); + if (!s->picture) + return AVERROR(ENOMEM); + s->picture_ptr = s->picture; + } s->avctx = avctx; ff_hpeldsp_init(&s->hdsp, avctx->flags); @@ -1370,7 +1373,7 @@ next_field: s->last_dc[i] = (4 << s->bits); if (s->lossless) { - av_assert0(s->picture_ptr == &s->picture); + av_assert0(s->picture_ptr == s->picture); if (CONFIG_JPEGLS_DECODER && s->ls) { // for () { // reset_ls_coding_parameters(s, 0); @@ -1391,7 +1394,7 @@ next_field: } } else { if (s->progressive && predictor) { - av_assert0(s->picture_ptr == &s->picture); + av_assert0(s->picture_ptr == s->picture); if ((ret = mjpeg_decode_scan_progressive_ac(s, predictor, ilv, prev_shift, point_transform)) < 0) @@ -2037,7 +2040,10 @@ av_cold int ff_mjpeg_decode_end(AVCodecContext *avctx) av_log(avctx, AV_LOG_INFO, "Single field\n"); } - if (s->picture_ptr) + if (s->picture) { + av_frame_free(&s->picture); + s->picture_ptr = NULL; + } else if (s->picture_ptr) av_frame_unref(s->picture_ptr); av_free(s->buffer); diff --git a/libavcodec/mjpegdec.h b/libavcodec/mjpegdec.h index fa69d50389..1335c66b8d 100644 --- a/libavcodec/mjpegdec.h +++ b/libavcodec/mjpegdec.h @@ -90,7 +90,7 @@ typedef struct MJpegDecodeContext { int h_max, v_max; /* maximum h and v counts */ int quant_index[4]; /* quant table index for each component */ int last_dc[MAX_COMPONENTS]; /* last DEQUANTIZED dc (XXX: am I right to do that ?) */ - AVFrame picture; /* picture structure */ + AVFrame *picture; /* picture structure */ AVFrame *picture_ptr; /* pointer to picture structure */ int got_picture; ///< we found a SOF and picture is valid, too. int linesize[MAX_COMPONENTS]; ///< linesize << interlaced |