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>
2013-11-17 00:11:33 +01:00
parent 29c83d23e8 6139f481ac
commit cc4a643563
4 changed files with 26 additions and 23 deletions
--- 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;