[FFmpeg-cvslog] r18988 - in trunk/libavcodec: h263dec.c h264.c svq3.c vc1.c

[bcoudurier]

Author: bcoudurier
Date: Sat May 30 02:24:20 2009
New Revision: 18988

Log:
remove unused hack which set AVCodecContext frame_number to pic timestamp

Modified:
   trunk/libavcodec/h263dec.c
   trunk/libavcodec/h264.c
   trunk/libavcodec/svq3.c
   trunk/libavcodec/vc1.c

Modified: trunk/libavcodec/h263dec.c
==============================================================================
--- trunk/libavcodec/h263dec.c	Sat May 30 02:09:00 2009	(r18987)
+++ trunk/libavcodec/h263dec.c	Sat May 30 02:24:20 2009	(r18988)
@@ -724,10 +724,6 @@ assert(s->current_picture.pict_type == s
         ff_print_debug_info(s, pict);
     }
 
-    /* Return the Picture timestamp as the frame number */
-    /* we subtract 1 because it is added on utils.c     */
-    avctx->frame_number = s->picture_number - 1;
-
 #ifdef PRINT_FRAME_TIME
 av_log(avctx, AV_LOG_DEBUG, "%"PRId64"\n", rdtsc()-time);
 #endif

Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c	Sat May 30 02:09:00 2009	(r18987)
+++ trunk/libavcodec/h264.c	Sat May 30 02:24:20 2009	(r18988)
@@ -7902,12 +7902,7 @@ static int decode_frame(AVCodecContext *
     assert(pict->data[0] || !*data_size);
     ff_print_debug_info(s, pict);
 //printf("out %d\n", (int)pict->data[0]);
-#if 0 //?
 
-    /* Return the Picture timestamp as the frame number */
-    /* we subtract 1 because it is added on utils.c     */
-    avctx->frame_number = s->picture_number - 1;
-#endif
     return get_consumed_bytes(s, buf_index, buf_size);
 }
 #if 0

Modified: trunk/libavcodec/svq3.c
==============================================================================
--- trunk/libavcodec/svq3.c	Sat May 30 02:09:00 2009	(r18987)
+++ trunk/libavcodec/svq3.c	Sat May 30 02:24:20 2009	(r18988)
@@ -1031,8 +1031,6 @@ static int svq3_decode_frame(AVCodecCont
         *(AVFrame *) data = *(AVFrame *) &s->last_picture;
     }
 
-    avctx->frame_number = s->picture_number - 1;
-
     /* Do not output the last pic after seeking. */
     if (s->last_picture_ptr || s->low_delay) {
         *data_size = sizeof(AVFrame);

Modified: trunk/libavcodec/vc1.c
==============================================================================
--- trunk/libavcodec/vc1.c	Sat May 30 02:09:00 2009	(r18987)
+++ trunk/libavcodec/vc1.c	Sat May 30 02:24:20 2009	(r18988)
@@ -4237,10 +4237,6 @@ assert(s->current_picture.pict_type == s
         ff_print_debug_info(s, pict);
     }
 
-    /* Return the Picture timestamp as the frame number */
-    /* we subtract 1 because it is added on utils.c     */
-    avctx->frame_number = s->picture_number - 1;
-
     av_free(buf2);
     return buf_size;
 }