diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-04 06:31:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-04 06:35:17 +0200 |
| commit | 87f40364d1a22aff5c9c245fa4ad07275c954248 (patch) | |
| tree | 4aec0853f83ac15ce8f299631505c145f48fe71e /libavformat/nsvdec.c | |
| parent | e4e2db9c74a10b2342297489edc00e99b10d5eb3 (diff) | |
| parent | dc6632f1195c929a87ddf1b02d12b681c6de79ad (diff) | |
| download | ffmpeg-87f40364d1a22aff5c9c245fa4ad07275c954248.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (21 commits)
build: simplify commands for clean target
swscale: split swscale.c in unscaled and generic conversion routines.
swscale: cosmetics.
swscale: integrate (literally) swscale_template.c in swscale.c.
swscale: split out x86/swscale_template.c from swscale.c.
swscale: enable hScale_altivec_real.
swscale: split out ppc _template.c files from main swscale.c.
swscale: remove indirections in ppc/swscale_template.c.
swscale: split out unscaled altivec YUV converters in their own file.
mpegvideoenc: fix multislice fate tests with threading disabled.
mpegts: Wrap #ifdef DEBUG and av_hex_dump_log() combination in a macro.
build: Simplify texi2html invocation through the --output option.
Mark some variables with av_unused
Replace avcodec_get_pix_fmt_name() by av_get_pix_fmt_name().
svq3: Check negative mb_type to fix potential crash.
svq3: Move svq3-specific fields to their own context.
rawdec: initialize return value to 0.
Remove unused get_psnr() prototype
rawdec: don't leak option strings.
bktr: get default framerate from video standard.
...
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nsvdec.c')
| -rw-r--r-- | libavformat/nsvdec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c index 300a8fd7f8..df9bc6b83d 100644 --- a/libavformat/nsvdec.c +++ b/libavformat/nsvdec.c @@ -267,7 +267,8 @@ static int nsv_parse_NSVf_header(AVFormatContext *s, AVFormatParameters *ap) { NSVContext *nsv = s->priv_data; AVIOContext *pb = s->pb; - unsigned int file_size, size; + unsigned int av_unused file_size; + unsigned int size; int64_t duration; int strings_size; int table_entries; @@ -546,7 +547,7 @@ static int nsv_read_chunk(AVFormatContext *s, int fill_header) uint32_t vsize; uint16_t asize; uint16_t auxsize; - uint32_t auxtag; + uint32_t av_unused auxtag; av_dlog(s, "%s(%d)\n", __FUNCTION__, fill_header); |