diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-11-08 10:30:37 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-11-08 10:30:37 +0100 |
| commit | 6aaf6db253062f84024d2b581e210122077f2c1a (patch) | |
| tree | ff08ca7ff22ae9b31942524f5ee07907530d7f0b /libavformat/mpegts.c | |
| parent | ac3c895d93a1bda738fd4576aec5c1cd0c0d8e1a (diff) | |
| download | ffmpeg-6aaf6db253062f84024d2b581e210122077f2c1a.tar.gz | |
Support decoding transport streams from Sony NXCAM.
Fixes ticket #617.
Diffstat (limited to 'libavformat/mpegts.c')
| -rw-r--r-- | libavformat/mpegts.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index e4daa7c332..29a0f612a1 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -617,7 +617,8 @@ static int mpegts_set_stream_info(AVStream *st, PESContext *pes, st->codec->codec_tag = pes->stream_type; mpegts_find_stream_type(st, pes->stream_type, ISO_types); - if (prog_reg_desc == AV_RL32("HDMV") && + if ((prog_reg_desc == AV_RL32("HDMV") || + prog_reg_desc == AV_RL32("HDPR")) && st->codec->codec_id == CODEC_ID_NONE) { mpegts_find_stream_type(st, pes->stream_type, HDMV_types); if (pes->stream_type == 0x83) { |