[SCM] libav/experimental: remove unused hack which set AVCodecContext frame_number to pic timestamp
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:46:44 UTC 2013
The following commit has been merged in the experimental branch:
commit 87e302bfd8ffbc6cdb20920029013956b10ace63
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date: Sat May 30 00:24:20 2009 +0000
remove unused hack which set AVCodecContext frame_number to pic timestamp
Originally committed as revision 18988 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index b087933..a6b0e04 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -724,10 +724,6 @@ assert(s->current_picture.pict_type == s->pict_type);
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
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index f4c172b..056e1cc 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -7902,12 +7902,7 @@ static int decode_frame(AVCodecContext *avctx,
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
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
index 28dacf7..1d488b7 100644
--- a/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@ -1031,8 +1031,6 @@ static int svq3_decode_frame(AVCodecContext *avctx,
*(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);
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index 8d79c18..acddeb9 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -4237,10 +4237,6 @@ assert(s->current_picture.pict_type == s->pict_type);
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;
}
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list