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/alsdec.c | |
| parent | c55bebe2cc7bd444f83a678babc1b287aa7a3da1 (diff) | |
| parent | 0a7005bebd23ade7bb852bce0401af1a8fdbb723 (diff) | |
| download | android_external_ffmpeg-18884f159b617208dd69fb35fa127f4fdedf5ba1.tar.gz android_external_ffmpeg-18884f159b617208dd69fb35fa127f4fdedf5ba1.tar.bz2 android_external_ffmpeg-18884f159b617208dd69fb35fa127f4fdedf5ba1.zip | |
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/alsdec.c')
| -rw-r--r-- | libavcodec/alsdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c index 46dd0b45ae..60dd8161e8 100644 --- a/libavcodec/alsdec.c +++ b/libavcodec/alsdec.c @@ -427,9 +427,9 @@ static int check_specific_config(ALSDecContext *ctx) } \ } - MISSING_ERR(sconf->floating, "Floating point decoding", -1); - MISSING_ERR(sconf->rlslms, "Adaptive RLS-LMS prediction", -1); - MISSING_ERR(sconf->chan_sort, "Channel sorting", 0); + MISSING_ERR(sconf->floating, "Floating point decoding", AVERROR_PATCHWELCOME); + MISSING_ERR(sconf->rlslms, "Adaptive RLS-LMS prediction", AVERROR_PATCHWELCOME); + MISSING_ERR(sconf->chan_sort, "Channel sorting", 0); return error; } |