cosmetics: reindent after last commit

[ffmpeg] / libavcodec / parser.c

diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index bbb2aab461e6792e4f81d1797e53b5024f837a2e..0b007e9ee4bce8fa63f4092328fd443c2220d0e2 100644 (file)
--- a/libavcodec/parser.c
+++ b/libavcodec/parser.c
@@ -89,7 +89,8 @@ void ff_fetch_timestamp(AVCodecParserContext *s, int off, int remove){
     s->offset= 0;
     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->frame_offset < s->cur_frame_offset[i] ||
+              (!s->frame_offset && !s->next_frame_offset)) // first field/frame
             //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];
@@ -153,7 +154,8 @@ int av_parser_parse2(AVCodecParserContext *s,
         /* padding is always necessary even if EOF, so we add it here */
         memset(dummy_buf, 0, sizeof(dummy_buf));
         buf = dummy_buf;
-    } else {
+    } else if (s->cur_offset + buf_size !=
+               s->cur_frame_end[s->cur_frame_start_index]) { /* skip remainder packets */
         /* add a new packet descriptor */
             i = (s->cur_frame_start_index + 1) & (AV_PARSER_PTS_NB - 1);
             s->cur_frame_start_index = i;