diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-26 02:09:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-26 02:36:07 +0200 |
| commit | 51bfaa21c85201ab31776a447599349a1ed6e96b (patch) | |
| tree | b7baafad803a06c5d582606f37f91a27e8342e59 /libavformat/avformat.h | |
| parent | f5fdb12d5552a3710611f15cd72ce6c7b6fb4da0 (diff) | |
| parent | a3a8572165ce636fb011b78764a2584777f81b95 (diff) | |
| download | ffmpeg-51bfaa21c85201ab31776a447599349a1ed6e96b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
g722dec: check output buffer size before decoding
g722dec: cosmetics: reindent/linewrap
g722dec: remove the use of lowres for half-rate decoding.
tta: check for extradata allocation failure in tta demuxer
tta: check for allocation failure of decode_buffer
tta: use correct frame_length calculation.
tta: add support for decoding 24-bit sample format
cosmetics: indentation
tta: remove pointless braces
tta: check output buffer size after adjusting frame length for last frame
tta: fix reading of format in TTA header.
tta: remove useless commented-out lines
tta: check remaining bitstream size while reading unary value
lavf: deprecate AVStream.stream_copy
avconc: split choose_codec() to choose_decoder/choose_encoder.
lavf: simplify by using FFMAX/FFMIN.
mpegenc: add preload private option.
cosmetics: simplify latm_decode_init
latm: avoid unnecessary reinit of the aac decoder
aacdec: initialize sbr context only in new channel elements
...
Conflicts:
avconv.c
libavcodec/resample.c
libavcodec/tta.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avformat.h')
| -rw-r--r-- | libavformat/avformat.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 441f85d503..425198fcda 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -540,8 +540,10 @@ typedef struct AVStream { */ AVRational time_base; int pts_wrap_bits; /**< number of bits in pts (used for wrapping control) */ +#if FF_API_STREAM_COPY /* ffmpeg.c private use */ - int stream_copy; /**< If set, just copy stream. */ + attribute_deprecated int stream_copy; /**< If set, just copy stream. */ +#endif enum AVDiscard discard; ///< Selects which packets can be discarded at will and do not need to be demuxed. #if FF_API_AVSTREAM_QUALITY @@ -772,7 +774,9 @@ typedef struct AVFormatContext { attribute_deprecated int mux_rate; #endif unsigned int packet_size; - int preload; +#if FF_API_PRELOAD + attribute_deprecated int preload; +#endif int max_delay; #if FF_API_LOOP_OUTPUT |