[FFmpeg-cvslog] avcodec/adpcm: Fix incorrect AVSampleFormat for sample_fmts_s16p

[Jon Morley]

ffmpeg | branch: release/1.1 | Jon Morley <jon at tweaksoftware.com> | Tue Aug 19 11:17:49 2014 -0700| [552fe9b07f6b0cd6879869e1b4a17e9293fbd5a5] | committer: Michael Niedermayer

avcodec/adpcm: Fix incorrect AVSampleFormat for sample_fmts_s16p

The AVSampleFormat list of sample_fmts_s16p is missing the trailing "P" for planar formats. AV_SAMPLE_FMT_S16 vs AV_SAMPLE_FMT_S16P

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 18e70006e7d39f256079cd461a0fe75f1e9cbfd2)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=552fe9b07f6b0cd6879869e1b4a17e9293fbd5a5
---

 libavcodec/adpcm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index cd68257..40ead43 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -1387,7 +1387,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data,
 
 static const enum AVSampleFormat sample_fmts_s16[]  = { AV_SAMPLE_FMT_S16,
                                                         AV_SAMPLE_FMT_NONE };
-static const enum AVSampleFormat sample_fmts_s16p[] = { AV_SAMPLE_FMT_S16,
+static const enum AVSampleFormat sample_fmts_s16p[] = { AV_SAMPLE_FMT_S16P,
                                                         AV_SAMPLE_FMT_NONE };
 static const enum AVSampleFormat sample_fmts_both[] = { AV_SAMPLE_FMT_S16,
                                                         AV_SAMPLE_FMT_S16P,