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 /libavcodec/mjpegdec.h | |
| parent | 2fade10cb0c53e6b2a663d8ce0566ba7c61013cf (diff) | |
| parent | e2274aa555f023e4f4e4819bf29b2d7e0adec7d5 (diff) | |
Merge commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5'
* commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5':
mjpegdec: use the AVFrame API properly.
Conflicts:
libavcodec/mjpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.h')
| -rw-r--r-- | libavcodec/mjpegdec.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 |