diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 12:45:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 12:46:10 +0200 |
| commit | 77aafadc5655401e5806daed58300a2cccb19fb8 (patch) | |
| tree | 5784ddb1ecdc62045e2db225279365e19f4358a1 /libavcodec/h264_parser.c | |
| parent | de417982e8977a1dbf05b48c9d0400c500bb5268 (diff) | |
| parent | db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8 (diff) | |
| download | ffmpeg-77aafadc5655401e5806daed58300a2cccb19fb8.tar.gz | |
Merge commit 'db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8'
* commit 'db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8':
h264: Move start code search functions into separate source files.
Conflicts:
libavcodec/arm/Makefile
libavcodec/arm/h264dsp_init_arm.c
libavcodec/h264_parser.c
libavcodec/h264dsp.c
libavcodec/startcode.c
libavcodec/startcode.h
See: 270cede3f3772117454a14b620803d731036942d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_parser.c')
| -rw-r--r-- | libavcodec/h264_parser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index e8243a23f6..1d4c2cfaee 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -66,7 +66,7 @@ static int h264_find_frame_end(H264Context *h, const uint8_t *buf, } if (state == 7) { - i += h->h264dsp.h264_find_start_code_candidate(buf + i, next_avc - i); + i += h->h264dsp.startcode_find_candidate(buf + i, next_avc - i); if (i < next_avc) state = 2; } else if (state <= 2) { |