diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-06 03:56:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-06 06:03:32 +0100 |
| commit | f095391a140ed3f379e1fb16605fac821c3e6660 (patch) | |
| tree | 6b0be38bffb002457cba26183c57e56d5d464551 /libavformat/avformat.h | |
| parent | 01606d10e600c4794d89490e731c321fb73a5141 (diff) | |
| parent | 632eb1bbae473f7105e0ec6556cb040ea6d30910 (diff) | |
| download | ffmpeg-f095391a140ed3f379e1fb16605fac821c3e6660.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (31 commits)
cdxl demux: do not create packets with uninitialized data at EOF.
Replace computations of remaining bits with calls to get_bits_left().
amrnb/amrwb: Remove get_bits usage.
cosmetics: reindent
avformat: do not require a pixel/sample format if there is no decoder
avformat: do not fill-in audio packet duration in compute_pkt_fields()
lavf: Use av_get_audio_frame_duration() in get_audio_frame_size()
dca_parser: parse the sample rate and frame durations
libspeexdec: do not set AVCodecContext.frame_size
libopencore-amr: do not set AVCodecContext.frame_size
alsdec: do not set AVCodecContext.frame_size
siff: do not set AVCodecContext.frame_size
amr demuxer: do not set AVCodecContext.frame_size.
aiffdec: do not set AVCodecContext.frame_size
mov: do not set AVCodecContext.frame_size
ape: do not set AVCodecContext.frame_size.
rdt: remove workaround for infinite loop with aac
avformat: do not require frame_size in avformat_find_stream_info() for CELT
avformat: do not require frame_size in avformat_find_stream_info() for MP1/2/3
avformat: do not require frame_size in avformat_find_stream_info() for AAC
...
Conflicts:
doc/APIchanges
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/h264.c
libavcodec/h264_ps.c
libavcodec/utils.c
libavcodec/version.h
libavcodec/x86/dsputil_mmx.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avformat.h')
| -rw-r--r-- | libavformat/avformat.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 1dc74fc9ff..434f355a17 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -650,12 +650,9 @@ typedef struct AVStream { double duration_error[2][2][MAX_STD_TIMEBASES]; int64_t codec_info_duration; int nb_decoded_frames; + int found_decoder; } *info; - AVPacket cur_pkt; - const uint8_t *cur_ptr; - int cur_len; - int pts_wrap_bits; /**< number of bits in pts (used for wrapping control) */ // Timestamp generation support: @@ -990,9 +987,6 @@ typedef struct AVFormatContext { struct AVPacketList *packet_buffer; struct AVPacketList *packet_buffer_end; - /* av_read_frame() support */ - AVStream *cur_st; - /* av_seek_frame() support */ int64_t data_offset; /**< offset of the first packet */ @@ -1005,6 +999,11 @@ typedef struct AVFormatContext { struct AVPacketList *raw_packet_buffer; struct AVPacketList *raw_packet_buffer_end; /** + * Packets split by the parser get queued here. + */ + struct AVPacketList *parse_queue; + struct AVPacketList *parse_queue_end; + /** * Remaining size available for raw_packet_buffer, in bytes. */ #define RAW_PACKET_BUFFER_SIZE 2500000 |