diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 22:04:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 22:04:16 +0100 |
| commit | e052f06531c400a845092a7e425ef97834260b3b (patch) | |
| tree | 85324d9b7c63a360d5a02e8d2018d1a176db1452 /libavcodec/avcodec.h | |
| parent | eba6a04e1c9c802186f14b93671dd3137ae6bea8 (diff) | |
| parent | 0f24a3ca999a702f83af9307f9f47b6fdeb546a5 (diff) | |
Merge commit '0f24a3ca999a702f83af9307f9f47b6fdeb546a5'
* commit '0f24a3ca999a702f83af9307f9f47b6fdeb546a5':
lavc: remove disabled FF_API_OLD_ENCODE_VIDEO cruft
lavc: remove disabled FF_API_OLD_ENCODE_AUDIO cruft
lavc: remove disabled FF_API_OLD_DECODE_AUDIO cruft
Conflicts:
libavcodec/flacenc.c
libavcodec/libgsm.c
libavcodec/utils.c
libavcodec/version.h
The compatibility wrapers are left as they likely sre still
in wide use. They will be removed when they break or otherwise
cause work without an volunteer being available.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index cc9adf753b..4fbef41d5f 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -547,11 +547,6 @@ typedef struct AVCodecDescriptor { */ #define AV_CODEC_PROP_BITMAP_SUB (1 << 16) -#if FF_API_OLD_DECODE_AUDIO -/* in bytes */ -#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio -#endif - /** * @ingroup lavc_decoding * Required number of additionally allocated bytes at the end of the input bitstream for decoding. |