diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-08 02:50:13 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-08 02:50:13 +0200 |
commit | c88caa522c41cd4108d39d8dd98805e867606ae3 (patch) | |
tree | 90eacfa0065bb907cd6543f5b2865d31d3d0a677 /libavcodec/avcodec.h | |
parent | db95e559f2b1c392295b09e8457d6f161eb5acdb (diff) | |
parent | a2031251c7eedd0d82cb9e08717990fa2ae6299f (diff) | |
download | ffmpeg-streaming-c88caa522c41cd4108d39d8dd98805e867606ae3.zip ffmpeg-streaming-c88caa522c41cd4108d39d8dd98805e867606ae3.tar.gz |
Merge remote branch 'qatar/master'
* qatar/master:
proto: include os_support.h in network.h
matroskaenc: don't write an empty Cues element.
lavc: add a FF_API_REQUEST_CHANNELS deprecation macro
avio: move extern url_interrupt_cb declaration from avio.h to url.h
avio: make av_register_protocol2 internal.
avio: avio_ prefix for url_set_interrupt_cb.
avio: AVIO_ prefixes for URL_ open flags.
proto: introduce listen option in tcp
doc: clarify configure features
proto: factor ff_network_wait_fd and use it on udp
Conflicts:
ffmpeg.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 c6fb2ef..f3d255c 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2601,7 +2601,7 @@ typedef struct AVCodecContext { */ int64_t timecode_frame_start; -#if LIBAVCODEC_VERSION_MAJOR < 53 +#if FF_API_REQUEST_CHANNELS /** * Decoder should decode to this many channels if it can (0 for default) * - encoding: unused |