virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

lavc: add width and height fields to AVFrame

Browse Source 
width and height are per-frame properties, setting these values in
AVFrame simplify the operation of extraction of that information,
since avoids the need to check the codec/stream context.
This commit is contained in:
Stefano Sabatini 2011-05-01 14:02:08 +02:00
parent 314374e579
commit 22333a6b19
5 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/APIchanges
View File

@ -13,6 +13,9 @@ libavutil: 2011-04-18
API changes, most recent first: API changes, most recent first:
2011-05-07 - xxxxxxx - lavc 53.4.0 - AVFrame
Add width and height fields to AVFrame.
2011-05-01 - xxxxxxx - lavfi 2.4.0 - avfilter.h 2011-05-01 - xxxxxxx - lavfi 2.4.0 - avfilter.h
Rename AVFilterBufferRefVideoProps.pixel_aspect to Rename AVFilterBufferRefVideoProps.pixel_aspect to
sample_aspect_ratio. sample_aspect_ratio.

7
libavcodec/avcodec.h
View File

@ -1018,6 +1018,13 @@ typedef struct AVPanScan{
* - decoding: Read by user.\ * - decoding: Read by user.\
*/\ */\
AVRational sample_aspect_ratio;\ AVRational sample_aspect_ratio;\
\
/**\
* width and height of the video frame\
* - encoding: unused\
* - decoding: Read by user.\
*/\
int width, height;\
#define FF_QSCALE_TYPE_MPEG1 0 #define FF_QSCALE_TYPE_MPEG1 0

4
libavcodec/utils.c
View File

@ -739,6 +739,10 @@ int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *pi
picture->pkt_pos= avpkt->pos; picture->pkt_pos= avpkt->pos;
if (!picture->sample_aspect_ratio.num) if (!picture->sample_aspect_ratio.num)
picture->sample_aspect_ratio = avctx->sample_aspect_ratio; picture->sample_aspect_ratio = avctx->sample_aspect_ratio;
if (!picture->width)
picture->width = avctx->width;
if (!picture->height)
picture->height = avctx->height;
} }
emms_c(); //needed to avoid an emms_c() call before every return; emms_c(); //needed to avoid an emms_c() call before every return;

2
libavcodec/version.h
View File

@ -21,7 +21,7 @@
#define AVCODEC_VERSION_H #define AVCODEC_VERSION_H
#define LIBAVCODEC_VERSION_MAJOR 53 #define LIBAVCODEC_VERSION_MAJOR 53
#define LIBAVCODEC_VERSION_MINOR 3 #define LIBAVCODEC_VERSION_MINOR 4
#define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

2
libavfilter/vsrc_buffer.c
View File

@ -102,6 +102,8 @@ int av_vsrc_buffer_add_frame2(AVFilterContext *buffer_filter, AVFrame *frame,
memcpy(c->frame.data , frame->data , sizeof(frame->data)); memcpy(c->frame.data , frame->data , sizeof(frame->data));
memcpy(c->frame.linesize, frame->linesize, sizeof(frame->linesize)); memcpy(c->frame.linesize, frame->linesize, sizeof(frame->linesize));
c->frame.width = frame->width;
c->frame.height = frame->height;
c->frame.interlaced_frame= frame->interlaced_frame; c->frame.interlaced_frame= frame->interlaced_frame;
c->frame.top_field_first = frame->top_field_first; c->frame.top_field_first = frame->top_field_first;
c->frame.key_frame = frame->key_frame; c->frame.key_frame = frame->key_frame;