[FFmpeg-cvslog] h264_parser: use enum values in h264_find_frame_end()
Vittorio Giovara
git at videolan.org
Sat Feb 15 21:32:52 CET 2014
ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Fri Feb 14 05:20:02 2014 +0100| [dc971acf4aa31fb5ffb37aad01e6f1fd8e90a0fa] | committer: Vittorio Giovara
h264_parser: use enum values in h264_find_frame_end()
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dc971acf4aa31fb5ffb37aad01e6f1fd8e90a0fa
---
libavcodec/h264_parser.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c
index b086707..a16229a 100644
--- a/libavcodec/h264_parser.c
+++ b/libavcodec/h264_parser.c
@@ -58,13 +58,15 @@ static int h264_find_frame_end(H264Context *h, const uint8_t *buf,
else
state >>= 1; // 2->1, 1->0, 0->0
} else if (state <= 5) {
- int v = buf[i] & 0x1F;
- if (v == 6 || v == 7 || v == 8 || v == 9) {
+ int nalu_type = buf[i] & 0x1F;
+ if (nalu_type == NAL_SEI || nalu_type == NAL_SPS ||
+ nalu_type == NAL_PPS || nalu_type == NAL_AUD) {
if (pc->frame_start_found) {
i++;
goto found;
}
- } else if (v == 1 || v == 2 || v == 5) {
+ } else if (nalu_type == NAL_SLICE || nalu_type == NAL_DPA ||
+ nalu_type == NAL_IDR_SLICE) {
if (pc->frame_start_found) {
state += 8;
continue;
More information about the ffmpeg-cvslog
mailing list