diff options
| author | James Almer <jamrial@gmail.com> | 2016-08-01 15:11:05 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-08-01 15:11:05 -0300 |
| commit | f41048f6ec5671c2e09ae317cecc1e98ecc3c2ce (patch) | |
| tree | 6a592b4d93164256410d27cf46e8da427b741bc4 /libavcodec/h264_refs.c | |
| parent | 12759cc0345cec5a418d8caec5435297d1ec04b2 (diff) | |
| parent | 5c2fb561d94fc51d76ab21d6f7cc5b6cc3aa599c (diff) | |
| download | ffmpeg-f41048f6ec5671c2e09ae317cecc1e98ecc3c2ce.tar.gz | |
Merge commit '5c2fb561d94fc51d76ab21d6f7cc5b6cc3aa599c'
* commit '5c2fb561d94fc51d76ab21d6f7cc5b6cc3aa599c':
h264: add H264_ prefix to the NAL unit types
Conflicts:
libavcodec/h264_parse.c
libavcodec/h264_parser.c
libavcodec/h264_slice.c
libavcodec/h264dec.c
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/h264_refs.c')
| -rw-r--r-- | libavcodec/h264_refs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index e66f69a2aa..e760df1880 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -828,7 +828,7 @@ int ff_h264_decode_ref_pic_marking(const H264Context *h, H264SliceContext *sl, MMCO *mmco = sl->mmco; int nb_mmco = 0; - if (h->nal_unit_type == NAL_IDR_SLICE) { // FIXME fields + if (h->nal_unit_type == H264_NAL_IDR_SLICE) { // FIXME fields skip_bits1(gb); // broken_link if (get_bits1(gb)) { mmco[0].opcode = MMCO_LONG; |