diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-06 13:23:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-06 13:45:08 +0200 |
| commit | 55c49afc42abae64e5ab25e04bc3c09b17c5b6d5 (patch) | |
| tree | 3e56007e0d3039ee6aa91e0e87b9abc14a49bf94 /libavutil | |
| parent | 886c3662d308e97316a606732574f0e87b1cbe3a (diff) | |
| parent | d3a72becc6371563185a509b94f5daf32ddbb485 (diff) | |
| download | ffmpeg-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 'libavutil')
| -rw-r--r-- | libavutil/dict.h | 2 | ||||
| -rw-r--r-- | libavutil/lfg.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/dict.h b/libavutil/dict.h index 7f9924b128..fde3650184 100644 --- a/libavutil/dict.h +++ b/libavutil/dict.h @@ -74,7 +74,7 @@ #define AV_DICT_APPEND 32 /**< If the entry already exists, append to it. Note that no delimiter is added, the strings are simply concatenated. */ -typedef struct { +typedef struct AVDictionaryEntry { char *key; char *value; } AVDictionaryEntry; diff --git a/libavutil/lfg.h b/libavutil/lfg.h index 854ffce737..ec90562cf2 100644 --- a/libavutil/lfg.h +++ b/libavutil/lfg.h @@ -22,7 +22,7 @@ #ifndef AVUTIL_LFG_H #define AVUTIL_LFG_H -typedef struct { +typedef struct AVLFG { unsigned int state[64]; int index; } AVLFG; |