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/arm/startcode.h | |
parent | de417982e8977a1dbf05b48c9d0400c500bb5268 (diff) | |
parent | db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8 (diff) | |
download | ffmpeg-streaming-77aafadc5655401e5806daed58300a2cccb19fb8.zip ffmpeg-streaming-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/arm/startcode.h')
-rw-r--r-- | libavcodec/arm/startcode.h | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/libavcodec/arm/startcode.h b/libavcodec/arm/startcode.h new file mode 100644 index 0000000..cf25d9d --- /dev/null +++ b/libavcodec/arm/startcode.h @@ -0,0 +1,26 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_ARM_STARTCODE_H +#define AVCODEC_ARM_STARTCODE_H + +#include <stdint.h> + +int ff_startcode_find_candidate_armv6(const uint8_t *buf, int size); + +#endif /* AVCODEC_ARM_STARTCODE_H */ |