diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-14 15:00:28 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-14 15:17:51 +0100 |
commit | b9d887c225466576ae80ef7f2b109e866ff137b2 (patch) | |
tree | 61ffb780b58021fe4186fb2caad3a8fdcb09bc5f /libavcodec/h264.h | |
parent | b6e7041f90daf89b17a10bcd73cd3b42d4e3540a (diff) | |
parent | 072be3e8969f24113d599444be4d6a0ed04a6602 (diff) | |
download | ffmpeg-streaming-b9d887c225466576ae80ef7f2b109e866ff137b2.zip ffmpeg-streaming-b9d887c225466576ae80ef7f2b109e866ff137b2.tar.gz |
Merge commit '072be3e8969f24113d599444be4d6a0ed04a6602'
* commit '072be3e8969f24113d599444be4d6a0ed04a6602':
h264: set parameters from SPS whenever it changes
asyncts: cosmetics: reindent
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
-rw-r--r-- | libavcodec/h264.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 4e44fba..eb88c0c 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -207,6 +207,7 @@ typedef struct SPS { int bit_depth_chroma; ///< bit_depth_chroma_minus8 + 8 int residual_color_transform_flag; ///< residual_colour_transform_flag int constraint_set_flags; ///< constraint_set[0-3]_flag + int new; ///< flag to keep track if the decoder context needs re-init due to changed SPS } SPS; /** @@ -333,6 +334,7 @@ typedef struct H264Context { int emu_edge_width; int emu_edge_height; + unsigned current_sps_id; ///< id of the current SPS SPS sps; ///< current sps /** |