diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-04 01:44:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-04 01:44:06 +0100 |
| commit | 259a960f1b74339626f8da890cc261a4043097fe (patch) | |
| tree | aea69b2dcfe4dfabedf82725fecbd2a551412f55 /libavcodec/avcodec.h | |
| parent | bb99ae3ae924c942a634bec7711ec7ee11c38eb9 (diff) | |
| parent | 2a6eb06254df79e96b3d791b6b89b2534ced3119 (diff) | |
| download | ffmpeg-259a960f1b74339626f8da890cc261a4043097fe.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vp6: Fix illegal read.
avfilter: Don't copy garbage from the stack when setting up video pictures.
avcodec: Make sure codec_type is set by avcodec_get_context_defaults2
avcodec: Remove a misplaced and useless attribute_deprecated
avconv: add -dump_attachment option.
avconv: add -attach option.
avconv: make negative mappings disable only streams from the specified file
fmtconvert: fix int32_to_float_fmul_scalar() for windows x86_64
Conflicts:
libavcodec/options.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index f5b06d3936..27c6f5e9f5 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -553,7 +553,7 @@ enum AVChromaLocation{ /** * LPC analysis type */ -attribute_deprecated enum AVLPCType { +enum AVLPCType { AV_LPC_TYPE_DEFAULT = -1, ///< use the codec default LPC type AV_LPC_TYPE_NONE = 0, ///< do not use LPC prediction or use all zero coefficients AV_LPC_TYPE_FIXED = 1, ///< fixed LPC coefficients |