aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-06-02 14:40:27 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-06-02 14:40:27 +0000
commit05d1d160bc674ab56b99307772a59cc7a8779187 (patch)
treea3bd95fa95e3c2ddf26e29cd6de1225802db6b32
parent5c027f8866bca84ff8416e2867fbe0b7db1dd1bd (diff)
downloadffmpeg-05d1d160bc674ab56b99307772a59cc7a8779187.tar.gz
Our MPEG-TS demuxer does not send complete PES packets but sends them
piecewise, thus the end values cannot be used for associating timestamps. Originally committed as revision 13626 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/parser.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index 47c7e714a8..4b2853708e 100644
--- a/libavcodec/parser.c
+++ b/libavcodec/parser.c
@@ -84,7 +84,8 @@ void ff_fetch_timestamp(AVCodecParserContext *s, int off, int remove){
for(i = 0; i < AV_PARSER_PTS_NB; i++) {
if ( s->next_frame_offset + off >= s->cur_frame_offset[i]
&&(s-> frame_offset < s->cur_frame_offset[i] || !s->frame_offset)
- && s->next_frame_offset + off < s->cur_frame_end[i]){
+ //check is disabled becausue mpeg-ts doesnt send complete PES packets
+ && /*s->next_frame_offset + off <*/ s->cur_frame_end[i]){
s->dts= s->cur_frame_dts[i];
s->pts= s->cur_frame_pts[i];
s->offset = s->next_frame_offset - s->cur_frame_offset[i];