eden-emu/FFmpeg
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

riff: use av_assert

Browse source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-06-14 23:52:56 +02:00
parent 9d87c8e6f8
commit 01a14ce042
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libavformat/riff.c
View file

@ -25,6 +25,7 @@
#include "avio_internal.h" #include "avio_internal.h"
#include "riff.h" #include "riff.h"
#include "libavcodec/bytestream.h" #include "libavcodec/bytestream.h"
#include "libavutil/avassert.h"
/* Note: when encoding, the first matching tag is used, so order is /* Note: when encoding, the first matching tag is used, so order is
important if multiple tags possible for a given codec. */ important if multiple tags possible for a given codec. */
@ -706,7 +707,7 @@ void ff_parse_specific_params(AVCodecContext *stream, int *au_rate, int *au_ssiz
void ff_get_guid(AVIOContext *s, ff_asf_guid *g) void ff_get_guid(AVIOContext *s, ff_asf_guid *g)
{ {
assert(sizeof(*g) == 16); av_assert0(sizeof(*g) == 16); //compiler will optimize this out
if (avio_read(s, *g, sizeof(*g)) < (int)sizeof(*g)) if (avio_read(s, *g, sizeof(*g)) < (int)sizeof(*g))
memset(*g, 0, sizeof(*g)); memset(*g, 0, sizeof(*g));
} }