summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavcodec/avcodec.h7
-rw-r--r--libavcodec/pthread.c2
-rw-r--r--libavcodec/utils.c2
3 files changed, 11 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index eb6826bcb0..0204af7df0 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1265,6 +1265,13 @@ typedef struct AVFrame {
* - decoding: Read by user.
*/
AVRational sample_aspect_ratio;
+
+ /**
+ * width and height of the video frame
+ * - encoding: unused
+ * - decoding: Read by user.
+ */
+ int width, height;
} AVFrame;
struct AVCodecInternal;
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index 17dd12da6c..1ec2d1a1f9 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -600,6 +600,8 @@ int ff_thread_decode_frame(AVCodecContext *avctx,
*got_picture_ptr = p->got_frame;
picture->pkt_dts = p->avpkt.dts;
picture->sample_aspect_ratio = avctx->sample_aspect_ratio;
+ picture->width = avctx->width;
+ picture->height = avctx->height;
/*
* A later call with avkpt->size == 0 may loop over all threads,
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 7c1a7aea2a..74932ed71d 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -860,6 +860,8 @@ int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *pi
avpkt);
picture->pkt_dts= avpkt->dts;
picture->sample_aspect_ratio = avctx->sample_aspect_ratio;
+ picture->width = avctx->width;
+ picture->height = avctx->height;
}
emms_c(); //needed to avoid an emms_c() call before every return;