ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-19 12:56:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

move ff_asf_guid, ff_guidcmp and ff_get_guid into riff.h

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Peter Ross 2011-04-05 20:36:46 +10:00 committed by Michael Niedermayer
parent dc41036105
commit c1309b27d2
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/asf.h
View File

@ -24,6 +24,7 @@
#include <stdint.h>
#include "avformat.h"
#include "metadata.h"
#include "riff.h"
#define PACKET_SIZE 3200
@ -46,8 +47,6 @@ typedef struct {
} ASFStream;
typedef uint8_t ff_asf_guid[16];
typedef struct {
ff_asf_guid guid; ///< generated by client computer
uint64_t file_size; /**< in bytes
@ -173,11 +172,4 @@ extern const AVMetadataConv ff_asf_metadata_conv[];
extern AVInputFormat ff_asf_demuxer;
static av_always_inline int ff_guidcmp(const void *g1, const void *g2)
{
return memcmp(g1, g2, sizeof(ff_asf_guid));
}
void ff_get_guid(AVIOContext *s, ff_asf_guid *g);
#endif /* AVFORMAT_ASF_H */

6
libavformat/asfdec.c
View File

@ -133,12 +133,6 @@ static void print_guid(const ff_asf_guid *g)
#define print_guid(g)
#endif
void ff_get_guid(AVIOContext *s, ff_asf_guid *g)
{
assert(sizeof(*g) == 16);
avio_read(s, *g, sizeof(*g));
}
static int asf_probe(AVProbeData *pd)
{
/* check file header */

6
libavformat/riff.c
View File

@ -584,3 +584,9 @@ void ff_parse_specific_params(AVCodecContext *stream, int *au_rate, int *au_ssiz
*au_scale /= gcd;
*au_rate /= gcd;
}
void ff_get_guid(AVIOContext *s, ff_asf_guid *g)
{
assert(sizeof(*g) == 16);
avio_read(s, *g, sizeof(*g));
}

9
libavformat/riff.h
View File

@ -54,4 +54,13 @@ unsigned int ff_codec_get_tag(const AVCodecTag *tags, enum CodecID id);
enum CodecID ff_codec_get_id(const AVCodecTag *tags, unsigned int tag);
void ff_parse_specific_params(AVCodecContext *stream, int *au_rate, int *au_ssize, int *au_scale);
typedef uint8_t ff_asf_guid[16];
static av_always_inline int ff_guidcmp(const void *g1, const void *g2)
{
return memcmp(g1, g2, sizeof(ff_asf_guid));
}
void ff_get_guid(AVIOContext *s, ff_asf_guid *g);
#endif /* AVFORMAT_RIFF_H */