[SCM] libav/experimental: check for unparsed AMR input
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:48:45 UTC 2013
The following commit has been merged in the experimental branch:
commit 2111e3f9f2fc32ebf415a82057d80e01fa263079
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Thu Jul 6 12:27:43 2006 +0000
check for unparsed AMR input
Originally committed as revision 5637 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 1709ffe..77b74b5 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -1532,6 +1532,10 @@ static int mov_write_packet(AVFormatContext *s, AVPacket *pkt)
len += packed_size[(pkt->data[len] >> 3) & 0x0F];
samplesInChunk++;
}
+ if(samplesInChunk > 1){
+ av_log(s, AV_LOG_ERROR, "fatal error, input is not a single packet, inplement a AVParser for it\n");
+ return -1;
+ }
} else if (trk->sampleSize)
samplesInChunk = size/trk->sampleSize;
else
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list