diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 15:42:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 15:42:49 +0200 |
| commit | 18884f159b617208dd69fb35fa127f4fdedf5ba1 (patch) | |
| tree | 2eae5d696ef3b8f8f03cb9c58ee88632ff9cc856 /libavcodec/mpc8.c | |
| parent | c55bebe2cc7bd444f83a678babc1b287aa7a3da1 (diff) | |
| parent | 0a7005bebd23ade7bb852bce0401af1a8fdbb723 (diff) | |
| download | ffmpeg-18884f159b617208dd69fb35fa127f4fdedf5ba1.tar.gz | |
Merge commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723'
* commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723':
rtpdec_xiph: fix function return type
smjpeg: fix type of 'ret' variable in smjpeg_read_packet()
mpegvideo: remove write-only variable
Use proper return values in case of missing features
fate: add avstring test
rangecoder-test: Set error message log level to error, instead of debug
Conflicts:
libavcodec/aacdec.c
libavcodec/amrnbdec.c
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpc8.c')
| -rw-r--r-- | libavcodec/mpc8.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c index 64d19193b0..8b1c9353ba 100644 --- a/libavcodec/mpc8.c +++ b/libavcodec/mpc8.c @@ -134,7 +134,7 @@ static av_cold int mpc8_decode_init(AVCodecContext * avctx) channels = get_bits(&gb, 4) + 1; if (channels > 2) { av_log_missing_feature(avctx, "Multichannel MPC SV8", 1); - return -1; + return AVERROR_PATCHWELCOME; } c->MSS = get_bits1(&gb); c->frames = 1 << (get_bits(&gb, 3) * 2); |