diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-23 18:26:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-23 18:26:37 +0200 |
| commit | 4ca6a151e0c48f2729027ac263269cb50e88ed71 (patch) | |
| tree | 1307128caf78999abcf1600fd0fa8224770baa3b /libavcodec/vc1.c | |
| parent | 276f43be68617c0d56001abf1e213911dd51fed7 (diff) | |
| parent | bc8c50512fc8550ae80535390379e00937623e00 (diff) | |
| download | ffmpeg-4ca6a151e0c48f2729027ac263269cb50e88ed71.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: print the codecs names in the stream mapping.
avconv: move the avcodec_find_decoder() call to add_input_streams().
Windows Media Image decoder (WMVP/WVP2)
ac3enc: remove outdated TODO comment for apply_channel_coupling()
Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/vc1dec.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1.c')
| -rw-r--r-- | libavcodec/vc1.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index 3cb556c3d4..04fa77a7de 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -314,9 +314,6 @@ int vc1_decode_sequence_header(AVCodecContext *avctx, VC1Context *v, GetBitConte "Old interlaced mode is not supported\n"); return -1; } - if (v->res_sprite) { - av_log(avctx, AV_LOG_ERROR, "WMVP is not fully supported\n"); - } } // (fps-2)/4 (->30) |