diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 12:17:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 12:19:55 +0100 |
| commit | 5b0c70c2499e20529d517b712910d6f4f72e9485 (patch) | |
| tree | 620207093db182a6b54129a2a166b2f721685378 /libavcodec/dnxhdenc.h | |
| parent | 3ea168edeb7a20eae1fccf7da66ac7b8c8c791ba (diff) | |
| parent | 57e7b3a89f5a0879ad039e8f04273b48649799a8 (diff) | |
| download | ffmpeg-streaming-5b0c70c2499e20529d517b712910d6f4f72e9485.zip ffmpeg-streaming-5b0c70c2499e20529d517b712910d6f4f72e9485.tar.gz | |
Merge commit '57e7b3a89f5a0879ad039e8f04273b48649799a8'
* commit '57e7b3a89f5a0879ad039e8f04273b48649799a8':
dnxhdenc: use the AVFrame API properly.
libx264: use the AVFrame API properly.
svq1enc: use the AVFrame API properly.
gif: use the AVFrame API properly.
Conflicts:
libavcodec/gif.c
libavcodec/svq1enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dnxhdenc.h')
| -rw-r--r-- | libavcodec/dnxhdenc.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/dnxhdenc.h b/libavcodec/dnxhdenc.h index 9b59b96..110b0ad 100644 --- a/libavcodec/dnxhdenc.h +++ b/libavcodec/dnxhdenc.h @@ -43,7 +43,6 @@ typedef struct DNXHDEncContext { AVClass *class; MpegEncContext m; ///< Used for quantization dsp functions - AVFrame frame; int cid; const CIDEntry *cid_table; uint8_t *msip; ///< Macroblock Scan Indexes Payload |
