diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-10 01:12:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-10 01:12:08 +0100 |
| commit | 8e31dbc1dcb56d40bcc1dd45840aaef0d37bae51 (patch) | |
| tree | 08342b8eede67521c32c139ebb4d9ddd04e871fa /libavformat/mpegts.c | |
| parent | 1af9fdc3baa47596757da7c401d58710cef45c75 (diff) | |
| parent | ffae713a5b3a0d20ff958d8bd58a052b495c38fd (diff) | |
| download | ffmpeg-8e31dbc1dcb56d40bcc1dd45840aaef0d37bae51.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Fix a bunch of common typos.
build: Skip compiling xvmc.h under the correct condition.
configure: darwin: Change dylib install names to include major version.
mpegts: Always honor a registration descriptor if present and there is no other codec information.
aacdec: Fix SCE parity check.
aacdec: Fix out of array writes (stack).
rtsp: Only set the ttl parameter if the server actually gave a value
udp: Set ttl for read-write streams, too, not only for write-only ones
udp: Only bind to the multicast address if in read-only mode
udp: Clarify the comment about binding the multicast address
udp: Reorder comments
Conflicts:
libavcodec/aacdec.c
tools/patcheck
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpegts.c')
| -rw-r--r-- | libavformat/mpegts.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 52a6f6e96f..cff970ee4e 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -1385,8 +1385,7 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type case 0x05: /* registration descriptor */ st->codec->codec_tag = bytestream_get_le32(pp); av_dlog(fc, "reg_desc=%.4s\n", (char*)&st->codec->codec_tag); - if (st->codec->codec_id == CODEC_ID_NONE && - stream_type == STREAM_TYPE_PRIVATE_DATA) + if (st->codec->codec_id == CODEC_ID_NONE) mpegts_find_stream_type(st, st->codec->codec_tag, REGD_types); break; case 0x52: /* stream identifier descriptor */ |