diff options
| author | Jon Morley <jon@tweaksoftware.com> | 2014-08-19 11:17:49 -0700 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-30 21:51:05 +0200 |
| commit | 552fe9b07f6b0cd6879869e1b4a17e9293fbd5a5 (patch) | |
| tree | 3ea47e590649170e2afefd17c93a5d76ce412f28 | |
| parent | 3ed4dc92284cfa1ce06e5af4458fdd374b3ca43d (diff) | |
| download | ffmpeg-552fe9b07f6b0cd6879869e1b4a17e9293fbd5a5.tar.gz | |
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@gmx.at>
(cherry picked from commit 18e70006e7d39f256079cd461a0fe75f1e9cbfd2)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/adpcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index cd68257256..40ead437f8 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, |