diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-11 04:23:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-11 04:23:25 +0200 |
| commit | 3602ad7ee6fe5caa402e61aa04ac695e1c46fe5e (patch) | |
| tree | 5d89faee8784c9f755974a0822a3e9e90673494e /libavcodec/version.h | |
| parent | 3b2d285afbd6304505a96b71877cdfda13f4565c (diff) | |
| parent | 142e76f1055de5dde44696e71a5f63f2cb11dedf (diff) | |
| download | ffmpeg-streaming-3602ad7ee6fe5caa402e61aa04ac695e1c46fe5e.zip ffmpeg-streaming-3602ad7ee6fe5caa402e61aa04ac695e1c46fe5e.tar.gz | |
Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf'
* commit '142e76f1055de5dde44696e71a5f63f2cb11dedf':
swscale: fix crash with dithering due incorrect offset calculation.
matroskadec: fix stupid typo (!= -> ==)
build: remove duplicates from order-only directory prerequisite list
build: rework rules for things in the tools dir
configure: fix --cpu=host with gcc 4.6
ARM: use const macro to define constant data in asm
bitdepth: simplify FUNC/FUNCC macros
dsputil: remove ff_emulated_edge_mc macro used in one place
9/10-bit: simplify clipping macros
matroskadec: reindent
matroskadec: defer parsing of cues element until we seek.
lavc: add support for codec-specific defaults.
lavc: make avcodec_alloc_context3 officially public.
lavc: remove a half-working attempt at different defaults for audio/video codecs.
ac3dec: add a drc_scale private option
lavf: add avformat_find_stream_info()
lavc: introduce avcodec_open2() as a replacement for avcodec_open().
Conflicts:
Makefile
libavcodec/utils.c
libavformat/avformat.h
libswscale/swscale_internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/version.h')
| -rw-r--r-- | libavcodec/version.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index 100c06d..de67bd4 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -68,5 +68,14 @@ #ifndef FF_API_GET_PIX_FMT_NAME #define FF_API_GET_PIX_FMT_NAME (LIBAVCODEC_VERSION_MAJOR < 54) #endif +#ifndef FF_API_ALLOC_CONTEXT +#define FF_API_ALLOC_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 54) +#endif +#ifndef FF_API_AVCODEC_OPEN +#define FF_API_AVCODEC_OPEN (LIBAVCODEC_VERSION_MAJOR < 54) +#endif +#ifndef FF_API_DRC_SCALE +#define FF_API_DRC_SCALE (LIBAVCODEC_VERSION_MAJOR < 54) +#endif #endif /* AVCODEC_VERSION_H */ |
