comparison h263dec.c @ 925:7fccaa0d699d libavcodec

AVVideoFrame -> AVFrame
author michaelni
date Mon, 09 Dec 2002 12:03:43 +0000
parents 3814e9115672
children 5627a7b7ce83
comparison
equal deleted inserted replaced
924:3814e9115672 925:7fccaa0d699d
347 void *data, int *data_size, 347 void *data, int *data_size,
348 UINT8 *buf, int buf_size) 348 UINT8 *buf, int buf_size)
349 { 349 {
350 MpegEncContext *s = avctx->priv_data; 350 MpegEncContext *s = avctx->priv_data;
351 int ret,i; 351 int ret,i;
352 AVVideoFrame *pict = data; 352 AVFrame *pict = data;
353 float new_aspect; 353 float new_aspect;
354 354
355 #ifdef PRINT_FRAME_TIME 355 #ifdef PRINT_FRAME_TIME
356 uint64_t time= rdtsc(); 356 uint64_t time= rdtsc();
357 #endif 357 #endif
674 } 674 }
675 675
676 } 676 }
677 #endif 677 #endif
678 if(s->pict_type==B_TYPE || s->low_delay){ 678 if(s->pict_type==B_TYPE || s->low_delay){
679 *pict= *(AVVideoFrame*)&s->current_picture; 679 *pict= *(AVFrame*)&s->current_picture;
680 } else { 680 } else {
681 *pict= *(AVVideoFrame*)&s->last_picture; 681 *pict= *(AVFrame*)&s->last_picture;
682 } 682 }
683 683
684 /* Return the Picture timestamp as the frame number */ 684 /* Return the Picture timestamp as the frame number */
685 /* we substract 1 because it is added on utils.c */ 685 /* we substract 1 because it is added on utils.c */
686 avctx->frame_number = s->picture_number - 1; 686 avctx->frame_number = s->picture_number - 1;
687 687
688 /* dont output the last pic after seeking */ 688 /* dont output the last pic after seeking */
689 if(s->last_picture.data[0] || s->low_delay) 689 if(s->last_picture.data[0] || s->low_delay)
690 *data_size = sizeof(AVVideoFrame); 690 *data_size = sizeof(AVFrame);
691 #ifdef PRINT_FRAME_TIME 691 #ifdef PRINT_FRAME_TIME
692 printf("%Ld\n", rdtsc()-time); 692 printf("%Ld\n", rdtsc()-time);
693 #endif 693 #endif
694 return get_consumed_bytes(s, buf_size); 694 return get_consumed_bytes(s, buf_size);
695 } 695 }