diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2008-01-11 23:33:32 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2008-01-11 23:33:32 +0000 |
| commit | 9ab3f71b60f478cd3b54369b396a6e71cac83859 (patch) | |
| tree | b3b15a02d6a6e8af2b70ff5cba2f93a875be1b3d /libavformat/matroskaenc.c | |
| parent | e609806ec6a79325773d8905d1d04b5442d8b5ed (diff) | |
| download | ffmpeg-9ab3f71b60f478cd3b54369b396a6e71cac83859.tar.gz | |
add a ff_ prefix to newly exported functions from avc.c
Originally committed as revision 11511 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/matroskaenc.c')
| -rw-r--r-- | libavformat/matroskaenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 7051d658cc..5027d739b0 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -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); |