diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-02 04:18:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-02 04:18:04 +0200 |
| commit | d4b98d475f8abf9f05ebe91b3fce341aa4b902ee (patch) | |
| tree | bc452a41fbc304d19ee058da006e9760cb160d6a /libavformat/mpegts.c | |
| parent | 8d8962ca3e95b1ce86ab505498e7cd3ec89fa996 (diff) | |
| parent | 1a9f9f81b1244b952126bb65bc741b04d3534f81 (diff) | |
| download | ffmpeg-d4b98d475f8abf9f05ebe91b3fce341aa4b902ee.tar.gz | |
Merge commit '1a9f9f8' into oldabi
* commit '1a9f9f8': (98 commits)
Do not drop packets with no valid ->pos set as e.g. DV-in-AVI produces.
FFMPEG: support demuxer specific options. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
AVIDEC: use_odmc demuxer specific option. (mostly an exmaple for demuxer specific options) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
LAVFAPI: demuxer specific options. (someone please add doxy) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
output_example: use avformat_alloc_output_context() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
LAVFAPI: avformat_alloc_output_context() / simplify usage of muxers. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
LAVF API: remove AVOutputFormat.set_parameters() the field is unused. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
CrystalHD: Add auto-detection of packed b-frame bug.
lavc: remove disabled avcodec_decode_video() code
Read the album_artist, grouping and lyrics metadata.
In libx264 wrapper, change wpredp to a codec specific option.
AMV: disable DR1 and don't override EMU_EDGE
lavf: inspect more frames for fps when container time base is coarse
Fix races in default av_log handler
flashsv2enc: regression test. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
vorbis: Replace sized int_fast integer types with plain int/unsigned.
Remove disabled non-optimized code variants.
bswap.h: Remove disabled code.
Remove some disabled printf debug cruft.
Replace more disabled printf() calls by av_dlog().
...
Conflicts:
libavcodec/options.c
libavcodec/qpeg.c
libavfilter/avfilter.h
libavformat/avformat.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpegts.c')
| -rw-r--r-- | libavformat/mpegts.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 8996b725fd..eb53486aeb 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -663,9 +663,6 @@ static int mpegts_push_data(MpegTSFilter *filter, if (pes->data_index == PES_START_SIZE) { /* we got all the PES or section header. We can now decide */ -#if 0 - av_hex_dump_log(pes->stream, AV_LOG_DEBUG, pes->header, pes->data_index); -#endif if (pes->header[0] == 0x00 && pes->header[1] == 0x00 && pes->header[2] == 0x01) { /* it must be an mpeg2 PES stream */ |