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.h | |
| parent | 000fb61a71c6288c377167fea1541700aef3612d (diff) | |
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.h')
| -rw-r--r-- | libavcodec/h264dec.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h index 1c0dfbf7f7..5e03d55558 100644 --- a/libavcodec/h264dec.h +++ b/libavcodec/h264dec.h @@ -534,6 +534,11 @@ typedef struct H264Context { int cur_bit_depth_luma; int16_t slice_row[MAX_SLICES]; ///< to detect when MAX_SLICES is too low + /* original AVCodecContext dimensions, used to handle container + * cropping */ + int width_from_caller; + int height_from_caller; + int enable_er; H264SEIContext sei; |