diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-20 14:04:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-20 14:04:38 +0100 |
| commit | 2d232f8b887fac002aa61d2ebc26f77f6e9f9da8 (patch) | |
| tree | f94188e5ddce5c56b3c58d1051a24c58929f1a51 /libavcodec | |
| parent | 70c0f13a9a40323456d8810a7a1ee0a6256c3384 (diff) | |
| download | ffmpeg-2d232f8b887fac002aa61d2ebc26f77f6e9f9da8.tar.gz | |
pcm: revert from libavs planar code to durandals.
The libav code does not work on big endian.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/pcm.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c index b0daf21122..36385f7e99 100644 --- a/libavcodec/pcm.c +++ b/libavcodec/pcm.c @@ -358,16 +358,7 @@ static int pcm_decode_frame(AVCodecContext *avctx, void *data, DECODE_PLANAR(16, be16, src, samples, n, 0, 0); break; case AV_CODEC_ID_PCM_S16LE_PLANAR: - n /= avctx->channels; - for (c = 0; c < avctx->channels; c++) { - samples = s->frame.extended_data[c]; -#if HAVE_BIGENDIAN - DECODE(16, le16, src, samples, n, 0, 0) -#else - memcpy(samples, src, n * 2); -#endif - src += n * 2; - } + DECODE_PLANAR(16, le16, src, samples, n, 0, 0); break; case AV_CODEC_ID_PCM_S24LE_PLANAR: DECODE_PLANAR(32, le24, src, samples, n, 8, 0); |