diff options
| author | James Almer <jamrial@gmail.com> | 2017-05-08 15:46:23 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-05-26 11:15:45 -0300 |
| commit | 6505e8cfd02b9112e24bb40c145d6c760f15d622 (patch) | |
| tree | e55cf237b2e7065eb4f69a5ec2f8f14bb95ccb6b /libavcodec/h264dec.c | |
| parent | 000fb61a71c6288c377167fea1541700aef3612d (diff) | |
| download | ffmpeg-6505e8cfd02b9112e24bb40c145d6c760f15d622.tar.gz | |
avcodec/h264dec: be more explicit in handling container cropping
This merges commit 4fded0480f20f4d7ca5e776a85574de34dfead14 from libav,
originally written by Anton Khirnov and skipped in
fc63d5ceb357c4b760cb02772de0b50d0557140f.
libavcodec/h264_slice.c | 20 +++++++++++++-------
libavcodec/h264dec.c | 3 +++
libavcodec/h264dec.h | 5 +++++
3 files changed, 21 insertions(+), 7 deletions(-)
Diffstat (limited to 'libavcodec/h264dec.c')
| -rw-r--r-- | libavcodec/h264dec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 35ab51f616..a8d07df1e7 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -309,6 +309,9 @@ static int h264_init_context(AVCodecContext *avctx, H264Context *h) h->avctx = avctx; h->cur_chroma_format_idc = -1; + h->width_from_caller = avctx->width; + h->height_from_caller = avctx->height; + h->picture_structure = PICT_FRAME; h->workaround_bugs = avctx->workaround_bugs; h->flags = avctx->flags; |