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/vc1dec.c | |
| parent | acb8d655d7507e4af8c5ba8e0e3a8ed74ce30c94 (diff) | |
| parent | 6f6c0294646bf992abd670d4c5c53c15a38346fd (diff) | |
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/vc1dec.c')
| -rw-r--r-- | libavcodec/vc1dec.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 3fe46d335e..177cc59508 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -6331,7 +6331,10 @@ AVCodec ff_wmv3image_decoder = { .decode = vc1_decode_frame, .capabilities = CODEC_CAP_DR1, .flush = vc1_sprite_flush, - .pix_fmts = ff_pixfmt_list_420 + .pix_fmts = (const enum AVPixelFormat[]) { + AV_PIX_FMT_YUV420P, + AV_PIX_FMT_NONE + }, }; #endif @@ -6347,6 +6350,9 @@ AVCodec ff_vc1image_decoder = { .decode = vc1_decode_frame, .capabilities = CODEC_CAP_DR1, .flush = vc1_sprite_flush, - .pix_fmts = ff_pixfmt_list_420 + .pix_fmts = (const enum AVPixelFormat[]) { + AV_PIX_FMT_YUV420P, + AV_PIX_FMT_NONE + }, }; #endif |