[FFmpeg-cvslog] avcodec/parser: put lost comments back
Michael Niedermayer
git at videolan.org
Wed Feb 26 19:21:00 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 26 17:29:18 2014 +0100| [bdadf05ec85393dd2398fcfd5baf5ed782aa3ab3] | committer: Michael Niedermayer
avcodec/parser: put lost comments back
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bdadf05ec85393dd2398fcfd5baf5ed782aa3ab3
---
libavcodec/parser.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index 6e3f585..3169e25 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];
More information about the ffmpeg-cvslog
mailing list