diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-29 00:30:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-29 00:30:35 +0100 |
| commit | 0e6aa0fef565fdb625673c60276e90c2ea091e8e (patch) | |
| tree | f0b08a7f4b465aaa0d9144e9b837b18294db3df6 /libavformat/mpegts.h | |
| parent | f929abd0c3643b28a9552512d698cf61ad4d08fa (diff) | |
| parent | bbeb29133b55b7256d18f5aaab8b5c8e919a173a (diff) | |
| download | ffmpeg-0e6aa0fef565fdb625673c60276e90c2ea091e8e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
adpcm: Clip step_index values read from the bitstream at the beginning of each frame.
oma: don't read beyond end of leaf_table.
doxygen: Remove documentation for non-existing parameters; misc small fixes.
Indeo3: fix crashes on corrupt bitstreams.
msmpeg4: Replace forward declaration by proper #include.
segment: implement wrap around
avf: reorder AVStream and AVFormatContext
aacdec: Remove erroneous reference to global gain from the out of bounds scalefactor error message.
Conflicts:
libavcodec/indeo3.c
libavformat/avformat.h
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpegts.h')
| -rw-r--r-- | libavformat/mpegts.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h index edec79ce2f..eae9d46ad4 100644 --- a/libavformat/mpegts.h +++ b/libavformat/mpegts.h @@ -96,10 +96,6 @@ typedef struct { * @param stream_type STREAM_TYPE_xxx * @param pp Descriptor buffer pointer * @param desc_list_end End of buffer - * @param mp4_dec_config_descr_len Length of 'mp4_dec_config_descr', or zero if not present - * @param mp4_es_id - * @param pid - * @param mp4_dec_config_descr * @return <0 to stop processing */ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type, |