diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-19 22:24:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-19 22:46:51 +0200 |
| commit | f4b05cd8415ad6160900bb00565f9b75e356530e (patch) | |
| tree | a1b89b58a5fd5d3d657d8135169ad39075a891be /libavcodec/h264.h | |
| parent | 05b2c998c7bfea642e3541787ab5dd3847e2ba81 (diff) | |
| parent | 5e83d9aced2fc2b2e1360452794c58aba55d497c (diff) | |
| download | ffmpeg-f4b05cd8415ad6160900bb00565f9b75e356530e.tar.gz | |
Merge commit '5e83d9aced2fc2b2e1360452794c58aba55d497c'
* commit '5e83d9aced2fc2b2e1360452794c58aba55d497c':
h264: fully support cropping.
Conflicts:
doc/APIchanges
libavcodec/h264.c
libavcodec/h264_ps.c
libavcodec/options_table.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index b3707ab1c6..61e1bcb427 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -168,6 +168,8 @@ typedef struct SPS { int mb_aff; ///< mb_adaptive_frame_field_flag int direct_8x8_inference_flag; int crop; ///< frame_cropping_flag + + /* those 4 are already in luma samples */ unsigned int crop_left; ///< frame_cropping_rect_left_offset unsigned int crop_right; ///< frame_cropping_rect_right_offset unsigned int crop_top; ///< frame_cropping_rect_top_offset @@ -276,6 +278,7 @@ typedef struct H264Context { int qp_thresh; ///< QP threshold to skip loopfilter + /* coded dimensions -- 16 * mb w/h */ int width, height; int linesize, uvlinesize; int chroma_x_shift, chroma_y_shift; |