aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-02-26 17:29:18 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-02-26 18:57:43 +0100
commitbdadf05ec85393dd2398fcfd5baf5ed782aa3ab3 (patch)
treeedb7a138459174b70349f74a63ab6dfa008530de
parent9d297641ee0bcae51a503c6855000bd2455cdd35 (diff)
downloadffmpeg-bdadf05ec85393dd2398fcfd5baf5ed782aa3ab3.tar.gz
avcodec/parser: put lost comments back
Found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/parser.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index 6e3f585a96..3169e2501f 100644
--- a/libavcodec/parser.c
+++ b/libavcodec/parser.c
@@ -104,8 +104,10 @@ void ff_fetch_timestamp(AVCodecParserContext *s, int off, int remove)
for (i = 0; i < AV_PARSER_PTS_NB; i++) {
if (s->cur_offset + off >= s->cur_frame_offset[i] &&
(s->frame_offset < s->cur_frame_offset[i] ||
- (!s->frame_offset && !s->next_frame_offset)) &&
- s->cur_frame_end[i]) {
+ (!s->frame_offset && !s->next_frame_offset)) && // first field/frame
+ // check disabled since MPEG-TS does not 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->pos = s->cur_frame_pos[i];