[SCM] libav/experimental: use avcodec_decode_audio2()

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:55:50 UTC 2013


The following commit has been merged in the experimental branch:
commit 5d55e966e18ec3490c20db85a3a137ba81cb2ad3
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Thu Feb 1 00:34:09 2007 +0000

    use avcodec_decode_audio2()
    
    Originally committed as revision 7792 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index be93da9..5cb702a 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1066,9 +1066,10 @@ static int output_packet(AVInputStream *ist, int ist_index,
             case CODEC_TYPE_AUDIO:{
                 if(pkt)
                     samples= av_fast_realloc(samples, &samples_size, FFMAX(pkt->size, AVCODEC_MAX_AUDIO_FRAME_SIZE));
+                data_size= samples_size;
                     /* XXX: could avoid copy if PCM 16 bits with same
                        endianness as CPU */
-                ret = avcodec_decode_audio(ist->st->codec, samples, &data_size,
+                ret = avcodec_decode_audio2(ist->st->codec, samples, &data_size,
                                            ptr, len);
                 if (ret < 0)
                     goto fail_decode;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list