RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add a ff_ prefix to newly exported functions from avc.c 

Originally committed as revision 11511 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2008-01-11 23:33:32 +00:00
parent e609806ec6
commit 9ab3f71b60
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/avc.c
View File

@ -58,7 +58,7 @@ static uint8_t *avc_find_startcode( uint8_t *p, uint8_t *end )
return end + 3;
}
int avc_parse_nal_units(uint8_t *buf_in, uint8_t **buf, int *size)
int ff_avc_parse_nal_units(uint8_t *buf_in, uint8_t **buf, int *size)
{
ByteIOContext *pb;
uint8_t *p = buf_in;
@ -81,7 +81,7 @@ int avc_parse_nal_units(uint8_t *buf_in, uint8_t **buf, int *size)
return 0;
}
int isom_write_avcc(ByteIOContext *pb, uint8_t *data, int len)
int ff_isom_write_avcc(ByteIOContext *pb, uint8_t *data, int len)
{
if (len > 6) {
/* check for h264 start code */
@ -90,7 +90,7 @@ int isom_write_avcc(ByteIOContext *pb, uint8_t *data, int len)
uint32_t sps_size=0, pps_size=0;
uint8_t *sps=0, *pps=0;
int ret = avc_parse_nal_units(data, &buf, &len);
int ret = ff_avc_parse_nal_units(data, &buf, &len);
if (ret < 0)
return ret;
data = buf;

4
libavformat/avc.h
View File

@ -25,7 +25,7 @@
#include <stdint.h>
#include "avio.h"
int avc_parse_nal_units(uint8_t *buf_in, uint8_t **buf, int *size);
int isom_write_avcc(ByteIOContext *pb, uint8_t *data, int len);
int ff_avc_parse_nal_units(uint8_t *buf_in, uint8_t **buf, int *size);
int ff_isom_write_avcc(ByteIOContext *pb, uint8_t *data, int len);
#endif /* AVC_H */

4
libavformat/matroskaenc.c
View File

@ -481,7 +481,7 @@ static int mkv_write_codecprivate(AVFormatContext *s, ByteIOContext *pb, AVCodec
else if (codec->codec_id == CODEC_ID_FLAC)
ret = put_flac_codecpriv(s, dyn_cp, codec);
else if (codec->codec_id == CODEC_ID_H264)
ret = isom_write_avcc(dyn_cp, codec->extradata, codec->extradata_size);
ret = ff_isom_write_avcc(dyn_cp, codec->extradata, codec->extradata_size);
else if (codec->extradata_size)
put_buffer(dyn_cp, codec->extradata, codec->extradata_size);
} else if (codec->codec_type == CODEC_TYPE_VIDEO) {
@ -749,7 +749,7 @@ static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt)
codec->extradata_size > 0 && AV_RB32(codec->extradata) == 0x00000001) {
/* from x264 or from bytestream h264 */
/* nal reformating needed */
int ret = avc_parse_nal_units(pkt->data, &pkt->data, &pkt->size);
int ret = ff_avc_parse_nal_units(pkt->data, &pkt->data, &pkt->size);
if (ret < 0)
return ret;
assert(pkt->size);

4
libavformat/movenc.c
View File

@ -422,7 +422,7 @@ static int mov_write_avcc_tag(ByteIOContext *pb, MOVTrack *track)
put_be32(pb, 0);
put_tag(pb, "avcC");
isom_write_avcc(pb, track->vosData, track->vosLen);
ff_isom_write_avcc(pb, track->vosData, track->vosLen);
return updateSize(pb, pos);
}
@ -1532,7 +1532,7 @@ static int mov_write_packet(AVFormatContext *s, AVPacket *pkt)
if (enc->codec_id == CODEC_ID_H264 && trk->vosLen > 0 && *(uint8_t *)trk->vosData != 1) {
/* from x264 or from bytestream h264 */
/* nal reformating needed */
int ret = avc_parse_nal_units(pkt->data, &pkt->data, &pkt->size);
int ret = ff_avc_parse_nal_units(pkt->data, &pkt->data, &pkt->size);
if (ret < 0)
return ret;
assert(pkt->size);