diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 03:11:33 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 03:11:33 +0400 |
| commit | cc4a6435638fa2a471fef048a3e68eaf7e6e306c (patch) | |
| tree | 074304931d2c5f76d97868399a5b46214fe915ce /libavcodec/asv.h | |
| parent | 29c83d23e8edf47ce423f85d4a2f2081a674a940 (diff) | |
| parent | 6139f481ac9feb1bee4e7d04789fb15d7f24ebbf (diff) | |
Merge commit '6139f481ac9feb1bee4e7d04789fb15d7f24ebbf'
* commit '6139f481ac9feb1bee4e7d04789fb15d7f24ebbf':
asvenc: use the AVFrame API properly.
a64multienc: use the AVFrame API properly.
Conflicts:
libavcodec/vaapi_mpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/asv.h')
| -rw-r--r-- | libavcodec/asv.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/asv.h b/libavcodec/asv.h index ca67c67daa..ce3c73aba4 100644 --- a/libavcodec/asv.h +++ b/libavcodec/asv.h @@ -38,7 +38,6 @@ typedef struct ASV1Context{ AVCodecContext *avctx; DSPContext dsp; - AVFrame picture; PutBitContext pb; GetBitContext gb; ScanTable scantable; |