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 /libavformat | |
| 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 'libavformat')
| -rw-r--r-- | libavformat/mxfenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 80318b8903..ffd0bf2d16 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -1860,11 +1860,11 @@ static int mxf_parse_h264_frame(AVFormatContext *s, AVStream *st, break; --buf; switch (state & 0x1f) { - case NAL_SPS: + case H264_NAL_SPS: st->codecpar->profile = buf[1]; e->flags |= 0x40; break; - case NAL_PPS: + case H264_NAL_PPS: if (e->flags & 0x40) { // sequence header present e->flags |= 0x80; // random access extra_size = 0; |