diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-09 14:36:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-09 15:18:46 +0200 |
| commit | 59a53842d360ddaf883a0415b11013038fa57da0 (patch) | |
| tree | bec280eb85d158ae75e54268cef1ebdd47be563c /libavcodec/mpegvideo.h | |
| parent | 60ef0c6f909703ae4dc021f6857d254c7badc1ec (diff) | |
| parent | f6774f905fb3cfdc319523ac640be30b14c1bc55 (diff) | |
| download | ffmpeg-59a53842d360ddaf883a0415b11013038fa57da0.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo: operate with pointers to AVFrames instead of whole structs
Conflicts:
libavcodec/h261dec.c
libavcodec/h263dec.c
libavcodec/intrax8.c
libavcodec/mpeg12enc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/mpegvideo_xvmc.c
libavcodec/msmpeg4.c
libavcodec/ratecontrol.c
libavcodec/vaapi.c
libavcodec/vc1dec.c
libavcodec/vdpau_vc1.c
See: fc567ac49e17151f00f31b59030cd10f952612ef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.h')
| -rw-r--r-- | libavcodec/mpegvideo.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index e57971de5e..97a5236245 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -92,7 +92,7 @@ struct MpegEncContext; * Picture. */ typedef struct Picture{ - struct AVFrame f; + struct AVFrame *f; uint8_t avframe_padding[1024]; // hack to allow linking to a avutil with larger AVFrame ThreadFrame tf; |