diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-05-01 14:10:20 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-05-07 11:45:37 +0200 |
| commit | 18ded93ab3db5996cd86fe2f5b36ba3c4bd58711 (patch) | |
| tree | 0444ed3f88a8d90d34bec1d93ea7cbfa9aa9ef01 /libavcodec | |
| parent | 22333a6b19f59ebc83933b910069d00c445d01ed (diff) | |
| download | ffmpeg-18ded93ab3db5996cd86fe2f5b36ba3c4bd58711.tar.gz | |
lavc: add format field to AVFrame
The format is a per-frame property, having it in AVFrame simplify the
operation of extraction of that information, since avoids the need to
access the codec/stream context.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 9 | ||||
| -rw-r--r-- | libavcodec/utils.c | 3 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index e26fcc212d..acdb183f90 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1025,6 +1025,15 @@ typedef struct AVPanScan{ * - decoding: Read by user.\ */\ int width, height;\ +\ + /**\ + * format of the frame, -1 if unknown or unset\ + * It should be cast to the corresponding enum (enum PixelFormat\ + * for video, enum AVSampleFormat for audio)\ + * - encoding: unused\ + * - decoding: Read by user.\ + */\ + int format;\ #define FF_QSCALE_TYPE_MPEG1 0 diff --git a/libavcodec/utils.c b/libavcodec/utils.c index dc26092dd1..5e0aa84ad0 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -456,6 +456,7 @@ void avcodec_get_frame_defaults(AVFrame *pic){ pic->pkt_pos = -1; pic->key_frame= 1; pic->sample_aspect_ratio = (AVRational){0, 1}; + pic->format = -1; /* unknown */ } AVFrame *avcodec_alloc_frame(void){ @@ -743,6 +744,8 @@ int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *pi picture->width = avctx->width; if (!picture->height) picture->height = avctx->height; + if (picture->format == PIX_FMT_NONE) + picture->format = avctx->pix_fmt; } emms_c(); //needed to avoid an emms_c() call before every return; diff --git a/libavcodec/version.h b/libavcodec/version.h index 362c4f1f2d..56d1eac52c 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -21,7 +21,7 @@ #define AVCODEC_VERSION_H #define LIBAVCODEC_VERSION_MAJOR 53 -#define LIBAVCODEC_VERSION_MINOR 4 +#define LIBAVCODEC_VERSION_MINOR 5 #define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |