aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mpeg4audio.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-06 13:23:05 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-06 13:45:08 +0200
commit55c49afc42abae64e5ab25e04bc3c09b17c5b6d5 (patch)
tree3e56007e0d3039ee6aa91e0e87b9abc14a49bf94 /libavcodec/mpeg4audio.h
parent886c3662d308e97316a606732574f0e87b1cbe3a (diff)
parentd3a72becc6371563185a509b94f5daf32ddbb485 (diff)
downloadffmpeg-55c49afc42abae64e5ab25e04bc3c09b17c5b6d5.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: yuv4mpeg: return proper error codes. Give all anonymously typedeffed structs in headers a name fate: Add parseutils test parseutils-test: Drop random colors from parsing test vf_pad/scale: use double precision for aspect ratios. build: error on variable-length arrays ppc: swscale: rework yuv2planeX_altivec() ppc: fmtconvert: kill VLA in float_to_int16_interleave_altivec() x86: dsputil: kill VLA in gmc_mmx() libspeexenc: Updated commentary to reflect recent changes libspeexenc: Add an option for enabling DTX doc/APIchanges: fill in missing dates and hashes. lavr: bump major to 1 and declare it stable. lavr: change the type of the data buffers to uint8_t**. lavc: deprecate the audio resampling API. Conflicts: cmdutils.h configure doc/APIchanges ffplay.c libavcodec/dwt.h libavcodec/libspeexenc.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavformat/asf.h tests/fate/libavutil.mak tests/ref/fate/parseutils Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4audio.h')
-rw-r--r--libavcodec/mpeg4audio.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpeg4audio.h b/libavcodec/mpeg4audio.h
index 21000a9acc..64839c6617 100644
--- a/libavcodec/mpeg4audio.h
+++ b/libavcodec/mpeg4audio.h
@@ -26,7 +26,7 @@
#include "get_bits.h"
#include "put_bits.h"
-typedef struct {
+typedef struct MPEG4AudioConfig {
int object_type;
int sampling_index;
int sample_rate;