diff options
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/demux_ts.c | 2 | ||||
-rw-r--r-- | libmpdemux/demuxer.c | 5 | ||||
-rw-r--r-- | libmpdemux/mp_taglists.c | 9 | ||||
-rw-r--r-- | libmpdemux/stheader.h | 2 |
4 files changed, 15 insertions, 3 deletions
diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c index 0085f286e0..dbb9f3ef55 100644 --- a/libmpdemux/demux_ts.c +++ b/libmpdemux/demux_ts.c @@ -901,7 +901,7 @@ static off_t ts_detect_streams(demuxer_t *demuxer, tsdemux_init_t *param) audio_found = 0; param->atype = UNKNOWN; //WE DIDN'T MATCH ANY AUDIO STREAM, SO WE FORCE THE DEMUXER TO IGNORE AUDIO - mp_msg(MSGT_DEMUXER, MSGL_INFO, "NO AUDIO! "); + mp_msg(MSGT_DEMUXER, MSGL_INFO, "NO AUDIO! (try increasing -tsprobe)"); } if(IS_SUB(param->stype)) diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index a4cee9b8ea..d441ac2863 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -516,10 +516,13 @@ static void allocate_parser(AVCodecContext **avctx, AVCodecParserContext **parse case 0x332D6361: case 0x332D4341: case 0x20736D: - case MKTAG('d', 'n', 'e', 't'): case MKTAG('s', 'a', 'c', '3'): codec_id = CODEC_ID_AC3; break; + case MKTAG('d', 'n', 'e', 't'): + // DNET/byte-swapped AC-3 - there is no parser for that yet + //codec_id = CODEC_ID_DNET; + break; case MKTAG('E', 'A', 'C', '3'): codec_id = CODEC_ID_EAC3; break; diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c index e994075d56..7fb493b3b6 100644 --- a/libmpdemux/mp_taglists.c +++ b/libmpdemux/mp_taglists.c @@ -46,6 +46,9 @@ static const struct mp_AVCodecTag mp_wav_tags[] = { { CODEC_ID_MUSEPACK7, MKTAG('M', 'P', 'C', ' ')}, { CODEC_ID_MUSEPACK8, MKTAG('M', 'P', 'C', '8')}, { CODEC_ID_NELLYMOSER, MKTAG('N', 'E', 'L', 'L')}, +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 92, 0) + { CODEC_ID_PCM_LXF, MKTAG('P', 'L', 'X', 'F')}, +#endif { CODEC_ID_QCELP, MKTAG('Q', 'c', 'l', 'p')}, { CODEC_ID_QDM2, MKTAG('Q', 'D', 'M', '2')}, { CODEC_ID_RA_144, MKTAG('1', '4', '_', '4')}, @@ -71,6 +74,7 @@ static const struct mp_AVCodecTag mp_codecid_override_tags[] = { { CODEC_ID_AC3, 0x2000}, { CODEC_ID_ADPCM_IMA_AMV, MKTAG('A', 'M', 'V', 'A')}, { CODEC_ID_DTS, 0x2001}, + { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 's', 'd')}, { CODEC_ID_EAC3, MKTAG('E', 'A', 'C', '3')}, { CODEC_ID_H264, MKTAG('H', '2', '6', '4')}, { CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'V')}, @@ -93,6 +97,8 @@ const struct mp_AVCodecTag * const mp_codecid_override_taglists[] = {mp_codecid_ static const struct mp_AVCodecTag mp_bmp_tags[] = { { CODEC_ID_AMV, MKTAG('A', 'M', 'V', 'V')}, + { CODEC_ID_ANM, MKTAG('A', 'N', 'M', ' ')}, + { CODEC_ID_AVS, MKTAG('A', 'V', 'S', ' ')}, { CODEC_ID_BETHSOFTVID, MKTAG('B', 'E', 'T', 'H')}, { CODEC_ID_BFI, MKTAG('B', 'F', 'I', 'V')}, { CODEC_ID_C93, MKTAG('C', '9', '3', 'V')}, @@ -103,6 +109,9 @@ static const struct mp_AVCodecTag mp_bmp_tags[] = { { CODEC_ID_FLIC, MKTAG('F', 'L', 'I', 'C')}, { CODEC_ID_IDCIN, MKTAG('I', 'D', 'C', 'I')}, { CODEC_ID_INTERPLAY_VIDEO, MKTAG('I', 'N', 'P', 'V')}, +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 114, 0) + { CODEC_ID_JV, MKTAG('F', 'F', 'J', 'V')}, +#endif { CODEC_ID_MDEC, MKTAG('M', 'D', 'E', 'C')}, { CODEC_ID_MOTIONPIXELS, MKTAG('M', 'V', 'I', '1')}, { CODEC_ID_NUV, MKTAG('N', 'U', 'V', '1')}, diff --git a/libmpdemux/stheader.h b/libmpdemux/stheader.h index dc84518abc..f67a3217ac 100644 --- a/libmpdemux/stheader.h +++ b/libmpdemux/stheader.h @@ -102,7 +102,7 @@ typedef struct sh_video { double i_pts; // PTS for the _next_ I/P frame float next_frame_time; double last_pts; - double buffered_pts[20]; + double buffered_pts[32]; int num_buffered_pts; double codec_reordered_pts; double prev_codec_reordered_pts; |