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/flacdec.c | |
| parent | c55bebe2cc7bd444f83a678babc1b287aa7a3da1 (diff) | |
| parent | 0a7005bebd23ade7bb852bce0401af1a8fdbb723 (diff) | |
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/flacdec.c')
| -rw-r--r-- | libavcodec/flacdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index 61c30e8c6f..24917ab36a 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -370,7 +370,7 @@ static inline int decode_subframe(FLACContext *s, int channel) } if (bps > 32) { av_log_missing_feature(s->avctx, "decorrelated bit depth > 32", 0); - return -1; + return AVERROR_PATCHWELCOME; } //FIXME use av_log2 for types |