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/omx.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/omx.c')
| -rw-r--r-- | libavcodec/omx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/omx.c b/libavcodec/omx.c index 1b2ae0d997..c1b6fb9847 100644 --- a/libavcodec/omx.c +++ b/libavcodec/omx.c @@ -703,7 +703,7 @@ static av_cold int omx_encode_init(AVCodecContext *avctx) nals[avctx->extradata[i + 4] & 0x1f]++; } } - if (nals[NAL_SPS] && nals[NAL_PPS]) + if (nals[H264_NAL_SPS] && nals[H264_NAL_PPS]) break; } else { if (avctx->extradata_size > 0) |