You've already forked FFmpeg
							
							
				mirror of
				https://github.com/FFmpeg/FFmpeg.git
				synced 2025-10-30 23:18:11 +02:00 
			
		
		
		
	remove unused hack which set AVCodecContext frame_number to pic timestamp
Originally committed as revision 18988 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
		| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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); | ||||
|   | ||||
| @@ -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; | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user