Merge commit '243e8443cd9e83c887e3f5edf09a169e7783d14e'

* commit '243e8443cd9e83c887e3f5edf09a169e7783d14e': alac: Reject rice_limit 0 if compression is used Conflicts: libavcodec/alac.c See: 4b657a1b1e Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · ce1c0e99e9
parent 918c5ea4d3 243e8443cd
commit ce1c0e99e9
1 changed files with 2 additions and 1 deletions
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@ -317,7 +317,8 @@ static int decode_element(AVCodecContext *avctx, AVFrame *frame, int ch_index,
        int rice_history_mult[2];

        if (!alac->rice_limit) {
-            avpriv_request_sample(alac->avctx, "Compression with rice limit 0");
+            avpriv_request_sample(alac->avctx,
+                                  "Compression with rice limit 0");
            return AVERROR(ENOSYS);
        }