diff options
| author | James Almer <jamrial@gmail.com> | 2017-05-08 15:46:24 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-05-26 11:15:45 -0300 |
| commit | 07596e45c5a0195b6e4e57597497ec7066817739 (patch) | |
| tree | c4fa896c8d8042d0f10d87c9ba04725458faf302 /libavcodec/h264dec.h | |
| parent | 6505e8cfd02b9112e24bb40c145d6c760f15d622 (diff) | |
| download | ffmpeg-streaming-07596e45c5a0195b6e4e57597497ec7066817739.zip ffmpeg-streaming-07596e45c5a0195b6e4e57597497ec7066817739.tar.gz | |
avcodec/h264dec: export cropping information instead of handling it internally
This merges commit c3e84820d67cb1d8cfb4196f9b43971308a81571 from libav,
originally written by Anton Khirnov and skipped in
fc63d5ceb357c4b760cb02772de0b50d0557140f.
libavcodec/h264_picture.c | 3 ---
libavcodec/h264_ps.c | 9 ---------
libavcodec/h264_slice.c | 25 +++++++++++++++++++------
libavcodec/h264dec.c | 13 +------------
libavcodec/h264dec.h | 9 +++++----
5 files changed, 25 insertions(+), 34 deletions(-)
Diffstat (limited to 'libavcodec/h264dec.h')
| -rw-r--r-- | libavcodec/h264dec.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h index 5e03d55..2106ba0 100644 --- a/libavcodec/h264dec.h +++ b/libavcodec/h264dec.h @@ -161,10 +161,6 @@ typedef struct H264Picture { int recovered; ///< picture at IDR or recovery point + recovery count int invalid_gap; int sei_recovery_frame_cnt; - - int crop; - int crop_left; - int crop_top; } H264Picture; typedef struct H264Ref { @@ -380,6 +376,11 @@ typedef struct H264Context { */ int picture_idr; + int crop_left; + int crop_right; + int crop_top; + int crop_bottom; + int8_t(*intra4x4_pred_mode); H264PredContext hpc; |
