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 13eb6b9097
)
This commit is contained in:

committed by
Michael Niedermayer

parent
97c5b0fa95
commit
877937b382
@@ -33,7 +33,6 @@
|
|||||||
#include "h264.h"
|
#include "h264.h"
|
||||||
#include "h264data.h"
|
#include "h264data.h"
|
||||||
#include "h264_mvpred.h"
|
#include "h264_mvpred.h"
|
||||||
#include "h264_parser.h"
|
|
||||||
#include "golomb.h"
|
#include "golomb.h"
|
||||||
#include "mathops.h"
|
#include "mathops.h"
|
||||||
#include "rectangle.h"
|
#include "rectangle.h"
|
||||||
|
@@ -26,14 +26,13 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "parser.h"
|
#include "parser.h"
|
||||||
#include "h264_parser.h"
|
|
||||||
#include "h264data.h"
|
#include "h264data.h"
|
||||||
#include "golomb.h"
|
#include "golomb.h"
|
||||||
|
|
||||||
#include <assert.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;
|
int i;
|
||||||
uint32_t state;
|
uint32_t state;
|
||||||
|
@@ -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 */
|
|
Reference in New Issue
Block a user