aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Abeni <lucabe72@email.it>2008-01-15 08:05:58 +0000
committerLuca Abeni <lucabe72@email.it>2008-01-15 08:05:58 +0000
commitb973f9ad7e7ef10454101b9292374d4903010ea1 (patch)
tree3bcc35d753ebad888083ecd8b09e1142ca931250
parentd75dcfdcebbb166805fb9ac8f2d622c82fc9141a (diff)
downloadffmpeg-b973f9ad7e7ef10454101b9292374d4903010ea1.tar.gz
Make avc_find_startcode non-static, so that it can be used from other
files (and add the ff_ prefix, to avoid polluting the namespace) Originally committed as revision 11532 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/avc.c6
-rw-r--r--libavformat/avc.h1
2 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/avc.c b/libavformat/avc.c
index fb9a8f7e0b..ade113c3e1 100644
--- a/libavformat/avc.c
+++ b/libavformat/avc.c
@@ -21,7 +21,7 @@
#include "avformat.h"
#include "avio.h"
-static uint8_t *avc_find_startcode( uint8_t *p, uint8_t *end )
+uint8_t *ff_avc_find_startcode(uint8_t *p, uint8_t *end)
{
uint8_t *a = p + 4 - ((long)p & 3);
@@ -68,10 +68,10 @@ int ff_avc_parse_nal_units(uint8_t *buf_in, uint8_t **buf, int *size)
if(ret < 0)
return ret;
- nal_start = avc_find_startcode(p, end);
+ nal_start = ff_avc_find_startcode(p, end);
while (nal_start < end) {
while(!*(nal_start++));
- nal_end = avc_find_startcode(nal_start, end);
+ nal_end = ff_avc_find_startcode(nal_start, end);
put_be32(pb, nal_end - nal_start);
put_buffer(pb, nal_start, nal_end - nal_start);
nal_start = nal_end;
diff --git a/libavformat/avc.h b/libavformat/avc.h
index a66e5f0ffd..932ce55027 100644
--- a/libavformat/avc.h
+++ b/libavformat/avc.h
@@ -27,5 +27,6 @@
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);
+uint8_t *ff_avc_find_startcode(uint8_t *p, uint8_t *end);
#endif /* AVC_H */