[FFmpeg-cvslog] pcm: revert from libavs planar code to durandals.
Michael Niedermayer
git at videolan.org
Tue Nov 20 14:09:33 CET 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 20 14:04:38 2012 +0100| [2d232f8b887fac002aa61d2ebc26f77f6e9f9da8] | committer: Michael Niedermayer
pcm: revert from libavs planar code to durandals.
The libav code does not work on big endian.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2d232f8b887fac002aa61d2ebc26f77f6e9f9da8
---
libavcodec/pcm.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c
index b0daf21..36385f7 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);
More information about the ffmpeg-cvslog
mailing list