diff options
| author | Diego Elio Pettenò <flameeyes@gmail.com> | 2011-01-25 00:59:30 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-01-26 03:43:32 +0100 |
| commit | 877937b3822888edad3d979e55cc43a4212ee3a4 (patch) | |
| tree | d9fb50db7b08decbed75a49e7ed6cf2e7d2b2cde | |
| parent | 97c5b0fa957a1480148d9ab6ee5924002a6182ea (diff) | |
| download | ffmpeg-877937b3822888edad3d979e55cc43a4212ee3a4.tar.gz | |
Make ff_h264_find_frame_end static to h264.c; delete h264_parser.h
The header is empty after making the function static, so delete it and
drop its usage.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 13eb6b90977768116c937c5d6b2e074679a3ad21)
| -rw-r--r-- | libavcodec/h264.c | 1 | ||||
| -rw-r--r-- | libavcodec/h264_parser.c | 3 | ||||
| -rw-r--r-- | libavcodec/h264_parser.h | 39 |
3 files changed, 1 insertions, 42 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 25417f7c4a..be46315b5e 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -33,7 +33,6 @@ #include "h264.h" #include "h264data.h" #include "h264_mvpred.h" -#include "h264_parser.h" #include "golomb.h" #include "mathops.h" #include "rectangle.h" diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index 70d08f4254..89523b5ca2 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -26,14 +26,13 @@ */ #include "parser.h" -#include "h264_parser.h" #include "h264data.h" #include "golomb.h" #include <assert.h> -int ff_h264_find_frame_end(H264Context *h, const uint8_t *buf, int buf_size) +static int ff_h264_find_frame_end(H264Context *h, const uint8_t *buf, int buf_size) { int i; uint32_t state; diff --git a/libavcodec/h264_parser.h b/libavcodec/h264_parser.h deleted file mode 100644 index 149f49a386..0000000000 --- a/libavcodec/h264_parser.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * H.26L/H.264/AVC/JVT/14496-10/... parser - * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at> - * - * 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 - */ - -/** - * @file - * H.264 / AVC / MPEG4 part10 parser. - * @author Michael Niedermayer <michaelni@gmx.at> - */ - -#ifndef AVCODEC_H264_PARSER_H -#define AVCODEC_H264_PARSER_H - -#include "h264.h" - -/** - * finds the end of the current frame in the bitstream. - * @return the position of the first byte of the next frame, or -1 - */ -int ff_h264_find_frame_end(H264Context *h, const uint8_t *buf, int buf_size); - -#endif /* AVCODEC_H264_PARSER_H */ |