diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 12:28:17 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 12:28:28 +0300 |
commit | 0d5e615c10583af5f346f0bc7420ebc5077a5d47 (patch) | |
tree | 673512e8fc02bf2233315b6a26352db6323f6f94 /libavcodec/h264.h | |
parent | 215430e049b78fc4c3d1cb8f6086bcd4bae0375e (diff) | |
parent | 27b0e6ebfd47b0c11156c18b90fa8c571f0f60c3 (diff) |
Merge commit '27b0e6ebfd47b0c11156c18b90fa8c571f0f60c3'
* commit '27b0e6ebfd47b0c11156c18b90fa8c571f0f60c3':
h264: drop needs_realloc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
-rw-r--r-- | libavcodec/h264.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index bafc40f96a..c595dde99f 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -322,7 +322,6 @@ typedef struct H264Picture { int mbaff; ///< 1 -> MBAFF frame 0-> not MBAFF int field_picture; ///< whether or not picture was encoded in separate fields - int needs_realloc; ///< picture needs to be reallocated (eg due to a frame size change) int reference; int recovered; ///< picture at IDR or recovery point + recovery count int invalid_gap; |