diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-10 16:19:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-10 16:25:23 +0200 |
| commit | 18b0c39f99eee508107c47345494e535b8757434 (patch) | |
| tree | b1418e52aab2f1fb8a171c3bb3fada3c7b0df531 /libavformat/ffmenc.c | |
| parent | d9d0c1ccc3df39fecbbbb6b600c18542741c5a51 (diff) | |
| parent | 05c36e0e5fbf0b75dbbbd327ad2f6a62992f9262 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
g723.1: fix addition overflow
g723.1: simplify and fix multiplication overflow
g723.1: deobfuscate an expression
g723.1: remove unused #includes
ARM: add missing "cc" clobber in av_clipl_int32_arm()
rtmp: Factorize the code by adding handle_invoke_error
rtmp: Factorize the code by adding handle_invoke_status
rtmp: Factorize the code by adding handle_invoke_result
libavutil: remove unused av_abort() macro
ffmenc: replace if/abort with assert()
libavutil: drop offsetof() fallback definition
libavutil: drop fallback definitions of INTxx_MIN/MAX
configure: Check for a sctp struct instead of just the header
configure: suncc: Add -xc99 to dependency flags, required on Solaris
doxygen: Fix function parameter names to match the code
doc: Drop obsolete shared libs cflags hint to workaround Cygwin gcc bugs
swf: Move shared table out of the header file
swf: Move swf_audio_codec_tags table to the only place it is used
fate: add G.723.1 decoder tests
Conflicts:
configure
doc/platform.texi
libavformat/Makefile
libavutil/arm/intmath.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/ffmenc.c')
| -rw-r--r-- | libavformat/ffmenc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/ffmenc.c b/libavformat/ffmenc.c index ca252dee08..6ce69cf8a9 100644 --- a/libavformat/ffmenc.c +++ b/libavformat/ffmenc.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <assert.h> + #include "libavutil/intreadwrite.h" #include "libavutil/intfloat.h" #include "libavutil/avassert.h" @@ -35,8 +37,7 @@ static void flush_packet(AVFormatContext *s) fill_size = ffm->packet_end - ffm->packet_ptr; memset(ffm->packet_ptr, 0, fill_size); - if (avio_tell(pb) % ffm->packet_size) - av_abort(); + assert(avio_tell(pb) % ffm->packet_size == 0); /* put header */ avio_wb16(pb, PACKET_ID); |