Merge commit '5c2fb561d94fc51d76ab21d6f7cc5b6cc3aa599c'
authorJames Almer <jamrial@gmail.com>
Mon, 1 Aug 2016 18:11:05 +0000 (15:11 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 1 Aug 2016 18:11:05 +0000 (15:11 -0300)
commitf41048f6ec5671c2e09ae317cecc1e98ecc3c2ce
tree6a592b4d93164256410d27cf46e8da427b741bc4
parent12759cc0345cec5a418d8caec5435297d1ec04b2
parent5c2fb561d94fc51d76ab21d6f7cc5b6cc3aa599c
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>
libavcodec/h264.h
libavcodec/h264_parse.c
libavcodec/h264_parser.c
libavcodec/h264_refs.c
libavcodec/h264_slice.c
libavcodec/h264dec.c
libavcodec/omx.c
libavcodec/vaapi_encode_h264.c
libavformat/mxfenc.c