diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-01-30 22:55:12 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-01-30 22:55:12 +0000 |
| commit | c55806e3a273b643f6e34c9806881fa2c777af0b (patch) | |
| tree | c85d93ea34e9907c0e08667d52bd92b274962a53 | |
| parent | 6299a22904d00d6d628eaa7ab0c648f70dfa970d (diff) | |
| download | ffmpeg-c55806e3a273b643f6e34c9806881fa2c777af0b.tar.gz | |
Flag to ignore dts on frames that contain pts.
This works around common issues with mpeg-ps files with broken timestamps.
Also allows playing the broken sample from issue1024.
Originally committed as revision 21562 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/avformat.h | 1 | ||||
| -rw-r--r-- | libavformat/options.c | 1 | ||||
| -rw-r--r-- | libavformat/utils.c | 3 |
3 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index f654df8885..a1ebe4ef12 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -604,6 +604,7 @@ typedef struct AVFormatContext { #define AVFMT_FLAG_GENPTS 0x0001 ///< Generate missing pts even if it requires parsing future frames. #define AVFMT_FLAG_IGNIDX 0x0002 ///< Ignore index. #define AVFMT_FLAG_NONBLOCK 0x0004 ///< Do not block when reading packets from input. +#define AVFMT_FLAG_IGNDTS 0x0008 ///< Ignore DTS on frames that contain both DTS & PTS int loop_input; /** decoding: size of data to probe; encoding: unused. */ diff --git a/libavformat/options.c b/libavformat/options.c index 5cc007e046..e595d22cca 100644 --- a/libavformat/options.c +++ b/libavformat/options.c @@ -46,6 +46,7 @@ static const AVOption options[]={ {"fflags", NULL, OFFSET(flags), FF_OPT_TYPE_FLAGS, DEFAULT, INT_MIN, INT_MAX, D|E, "fflags"}, {"ignidx", "ignore index", 0, FF_OPT_TYPE_CONST, AVFMT_FLAG_IGNIDX, INT_MIN, INT_MAX, D, "fflags"}, {"genpts", "generate pts", 0, FF_OPT_TYPE_CONST, AVFMT_FLAG_GENPTS, INT_MIN, INT_MAX, D, "fflags"}, +{"igndts", "ingore dts", 0, FF_OPT_TYPE_CONST, AVFMT_FLAG_IGNDTS, INT_MIN, INT_MAX, D, "fflags"}, #if LIBAVFORMAT_VERSION_INT < (53<<16) {"track", " set the track number", OFFSET(track), FF_OPT_TYPE_INT, DEFAULT, 0, INT_MAX, E}, {"year", "set the year", OFFSET(year), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, E}, diff --git a/libavformat/utils.c b/libavformat/utils.c index c15b5f1cf0..260dc7641c 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -808,6 +808,9 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, int num, den, presentation_delayed, delay, i; int64_t offset; + if((s->flags & AVFMT_FLAG_IGNDTS) && pkt->pts != AV_NOPTS_VALUE) + pkt->dts= AV_NOPTS_VALUE; + if (st->codec->codec_id != CODEC_ID_H264 && pc && pc->pict_type == FF_B_TYPE) //FIXME Set low_delay = 0 when has_b_frames = 1 st->codec->has_b_frames = 1; |