mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
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
This commit is contained in:
parent
d75dcfdceb
commit
b973f9ad7e
@ -21,7 +21,7 @@
|
|||||||
#include "avformat.h"
|
#include "avformat.h"
|
||||||
#include "avio.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);
|
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)
|
if(ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
nal_start = avc_find_startcode(p, end);
|
nal_start = ff_avc_find_startcode(p, end);
|
||||||
while (nal_start < end) {
|
while (nal_start < end) {
|
||||||
while(!*(nal_start++));
|
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_be32(pb, nal_end - nal_start);
|
||||||
put_buffer(pb, nal_start, nal_end - nal_start);
|
put_buffer(pb, nal_start, nal_end - nal_start);
|
||||||
nal_start = nal_end;
|
nal_start = nal_end;
|
||||||
|
@ -27,5 +27,6 @@
|
|||||||
|
|
||||||
int ff_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);
|
||||||
int ff_isom_write_avcc(ByteIOContext *pb, uint8_t *data, int len);
|
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 */
|
#endif /* AVC_H */
|
||||||
|
Loading…
Reference in New Issue
Block a user