Mercurial > libavformat.hg

changeset 2927:b75a49790f31 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add a ff_ prefix to newly exported functions from avc.c
author aurel
date Fri, 11 Jan 2008 23:33:32 +0000
parents a6730b458d6c
children bdc992cb8e46
files avc.c avc.h matroskaenc.c movenc.c
diffstat 4 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/avc.c	Fri Jan 11 23:21:22 2008 +0000
+++ b/avc.c	Fri Jan 11 23:33:32 2008 +0000
@@ -58,7 +58,7 @@
     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 @@
     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 @@
             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;
--- a/avc.h	Fri Jan 11 23:21:22 2008 +0000
+++ b/avc.h	Fri Jan 11 23:33:32 2008 +0000
@@ -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 */
--- a/matroskaenc.c	Fri Jan 11 23:21:22 2008 +0000
+++ b/matroskaenc.c	Fri Jan 11 23:33:32 2008 +0000
@@ -481,7 +481,7 @@
         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 @@
         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);
--- a/movenc.c	Fri Jan 11 23:21:22 2008 +0000
+++ b/movenc.c	Fri Jan 11 23:33:32 2008 +0000
@@ -422,7 +422,7 @@
 
     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 @@
     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);