Add flag to mark demuxers that can output discontinuous timestamps.

(could also be added to muxers if someone wants)

Originally committed as revision 14777 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Michael Niedermayer 17 years ago
parent 8a9d72a0ff
commit ff9c8d7c6f
  1. 1
      libavformat/avformat.h
  2. 2
      libavformat/mpeg.c
  3. 4
      libavformat/mpegts.c

@ -187,6 +187,7 @@ typedef struct AVFormatParameters {
#define AVFMT_GLOBALHEADER 0x0040 /**< format wants global header */ #define AVFMT_GLOBALHEADER 0x0040 /**< format wants global header */
#define AVFMT_NOTIMESTAMPS 0x0080 /**< format does not need / have any timestamps */ #define AVFMT_NOTIMESTAMPS 0x0080 /**< format does not need / have any timestamps */
#define AVFMT_GENERIC_INDEX 0x0100 /**< use generic index building code */ #define AVFMT_GENERIC_INDEX 0x0100 /**< use generic index building code */
#define AVFMT_TS_DISCONT 0x0200 /**< format allows timestamo discontinuities */
typedef struct AVOutputFormat { typedef struct AVOutputFormat {
const char *name; const char *name;

@ -586,5 +586,5 @@ AVInputFormat mpegps_demuxer = {
NULL, NULL,
NULL, //mpegps_read_seek, NULL, //mpegps_read_seek,
mpegps_read_dts, mpegps_read_dts,
.flags = AVFMT_SHOW_IDS, .flags = AVFMT_SHOW_IDS|AVFMT_TS_DISCONT,
}; };

@ -1524,7 +1524,7 @@ AVInputFormat mpegts_demuxer = {
mpegts_read_close, mpegts_read_close,
read_seek, read_seek,
mpegts_get_pcr, mpegts_get_pcr,
.flags = AVFMT_SHOW_IDS, .flags = AVFMT_SHOW_IDS|AVFMT_TS_DISCONT,
}; };
AVInputFormat mpegtsraw_demuxer = { AVInputFormat mpegtsraw_demuxer = {
@ -1537,5 +1537,5 @@ AVInputFormat mpegtsraw_demuxer = {
mpegts_read_close, mpegts_read_close,
read_seek, read_seek,
mpegts_get_pcr, mpegts_get_pcr,
.flags = AVFMT_SHOW_IDS, .flags = AVFMT_SHOW_IDS|AVFMT_TS_DISCONT,
}; };

Loading…
Cancel
Save