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/h264_picture.c | |
| parent | 6505e8cfd02b9112e24bb40c145d6c760f15d622 (diff) | |
| download | ffmpeg-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/h264_picture.c')
| -rw-r--r-- | libavcodec/h264_picture.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c index 2dbe5ee40b..99d9f9075c 100644 --- a/libavcodec/h264_picture.c +++ b/libavcodec/h264_picture.c @@ -113,9 +113,6 @@ int ff_h264_ref_picture(H264Context *h, H264Picture *dst, H264Picture *src) dst->mbaff = src->mbaff; dst->field_picture = src->field_picture; dst->reference = src->reference; - dst->crop = src->crop; - dst->crop_left = src->crop_left; - dst->crop_top = src->crop_top; dst->recovered = src->recovered; dst->invalid_gap = src->invalid_gap; dst->sei_recovery_frame_cnt = src->sei_recovery_frame_cnt; |