aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/eac3dec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-13 15:42:49 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-13 15:42:49 +0200
commit18884f159b617208dd69fb35fa127f4fdedf5ba1 (patch)
tree2eae5d696ef3b8f8f03cb9c58ee88632ff9cc856 /libavcodec/eac3dec.c
parentc55bebe2cc7bd444f83a678babc1b287aa7a3da1 (diff)
parent0a7005bebd23ade7bb852bce0401af1a8fdbb723 (diff)
downloadffmpeg-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/eac3dec.c')
-rw-r--r--libavcodec/eac3dec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/eac3dec.c b/libavcodec/eac3dec.c
index 91e35ad934..2bd0619169 100644
--- a/libavcodec/eac3dec.c
+++ b/libavcodec/eac3dec.c
@@ -322,7 +322,7 @@ int ff_eac3_parse_header(AC3DecodeContext *s)
handled like AC-3 DolbyNet, but we cannot be sure until we have a
sample which utilizes this feature. */
av_log_missing_feature(s->avctx, "Reduced sampling rates", 1);
- return -1;
+ return AVERROR_PATCHWELCOME;
}
skip_bits(gbc, 5); // skip bitstream id