diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 03:56:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 03:56:43 +0100 |
| commit | 6ee2911996ed5aea8fd49fd264cfb7930a7cd10e (patch) | |
| tree | 124917f72c0c720c4e019a41dc917cdca0b7c5a2 /libavcodec/mpegvideo.h | |
| parent | acb8d655d7507e4af8c5ba8e0e3a8ed74ce30c94 (diff) | |
| parent | 6f6c0294646bf992abd670d4c5c53c15a38346fd (diff) | |
| download | ffmpeg-6ee2911996ed5aea8fd49fd264cfb7930a7cd10e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: drop ff_pixfmt_list_420
Conflicts:
libavcodec/flvdec.c
libavcodec/msmpeg4dec.c
libavcodec/rv10.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.h')
| -rw-r--r-- | libavcodec/mpegvideo.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index cfbbb0653c..75c2b71ae0 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -763,8 +763,6 @@ void ff_MPV_motion(MpegEncContext *s, */ int ff_alloc_picture(MpegEncContext *s, Picture *pic, int shared); -extern const enum AVPixelFormat ff_pixfmt_list_420[]; - /** * permute block according to permuatation. * @param last last non zero element in scantable order |