diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 13:27:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 13:55:50 +0100 |
| commit | be1e6e7503b2f10b0176201418eb97912cee093f (patch) | |
| tree | 620da8277e8837ccbb93a2a21e14a9b188c95b16 /libavcodec/jpegls.h | |
| parent | f4f7888bab7061f08c54356c285adaba24383dc0 (diff) | |
| parent | 1c01b0253ebfe05f907c3a723101fe77f6dd2336 (diff) | |
| download | ffmpeg-be1e6e7503b2f10b0176201418eb97912cee093f.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo_enc: use the AVFrame API properly.
ffv1: use the AVFrame API properly.
jpegls: use the AVFrame API properly.
huffyuv: use the AVFrame API properly.
Conflicts:
libavcodec/ffv1.c
libavcodec/ffv1.h
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c
Changes to ffv1 are more redone than merged due to them being based on
an ancient codebase and a good part of that having being done already
as well.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpegls.h')
| -rw-r--r-- | libavcodec/jpegls.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/jpegls.h b/libavcodec/jpegls.h index 2dc3832517..10ae054a7b 100644 --- a/libavcodec/jpegls.h +++ b/libavcodec/jpegls.h @@ -33,7 +33,6 @@ typedef struct JpeglsContext { AVCodecContext *avctx; - AVFrame picture; } JpeglsContext; typedef struct JLSState { |