Merge commit '0bca0283ccded5e32da143a462168ad1988a58fd'

[ffmpeg] / libavcodec / flacdec.c

diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c
index 24917ab36a91f5f14d298af07b6e07ed171f8faa..126fc8d2c5532d55f65f8bce60110435cdd8217d 100644 (file)
--- a/libavcodec/flacdec.c
+++ b/libavcodec/flacdec.c
@@ -573,5 +573,5 @@ AVCodec ff_flac_decoder = {
                                                       AV_SAMPLE_FMT_S16P,
                                                       AV_SAMPLE_FMT_S32,
                                                       AV_SAMPLE_FMT_S32P,
-                                                      -1 },
+                                                      AV_SAMPLE_FMT_NONE },
 };