repositories
/
deb_ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Debian version 2.5.0~trusty1.1
[deb_ffmpeg.git]
/
ffmpeg
/
libavformat
/
cafdec.c
diff --git
a/ffmpeg/libavformat/cafdec.c
b/ffmpeg/libavformat/cafdec.c
index 80c5bb596280b5e8abc847e63c85789a641d10af..7d518d78d203d1aa162eb88b717844b96efb2c9d 100644
(file)
--- a/
ffmpeg/libavformat/cafdec.c
+++ b/
ffmpeg/libavformat/cafdec.c
@@
-46,7
+46,7
@@
typedef struct {
int64_t data_start; ///< data start position, in bytes
int64_t data_size; ///< raw data size, in bytes
int64_t data_start; ///< data start position, in bytes
int64_t data_size; ///< raw data size, in bytes
-} Caf
f
Context;
+} CafContext;
static int probe(AVProbeData *p)
{
static int probe(AVProbeData *p)
{
@@
-59,7
+59,7
@@
static int probe(AVProbeData *p)
static int read_desc_chunk(AVFormatContext *s)
{
AVIOContext *pb = s->pb;
static int read_desc_chunk(AVFormatContext *s)
{
AVIOContext *pb = s->pb;
- Caf
fContext *caf
= s->priv_data;
+ Caf
Context *caf
= s->priv_data;
AVStream *st;
int flags;
AVStream *st;
int flags;
@@
-167,7
+167,7
@@
static int read_pakt_chunk(AVFormatContext *s, int64_t size)
{
AVIOContext *pb = s->pb;
AVStream *st = s->streams[0];
{
AVIOContext *pb = s->pb;
AVStream *st = s->streams[0];
- Caf
fContext *caf
= s->priv_data;
+ Caf
Context *caf
= s->priv_data;
int64_t pos = 0, ccount, num_packets;
int i;
int64_t pos = 0, ccount, num_packets;
int i;
@@
-216,7
+216,7
@@
static void read_info_chunk(AVFormatContext *s, int64_t size)
static int read_header(AVFormatContext *s)
{
AVIOContext *pb = s->pb;
static int read_header(AVFormatContext *s)
{
AVIOContext *pb = s->pb;
- Caf
fContext *caf
= s->priv_data;
+ Caf
Context *caf
= s->priv_data;
AVStream *st;
uint32_t tag = 0;
int found_data, ret;
AVStream *st;
uint32_t tag = 0;
int found_data, ret;
@@
-334,7
+334,7
@@
static int read_packet(AVFormatContext *s, AVPacket *pkt)
{
AVIOContext *pb = s->pb;
AVStream *st = s->streams[0];
{
AVIOContext *pb = s->pb;
AVStream *st = s->streams[0];
- Caf
fContext *caf
= s->priv_data;
+ Caf
Context *caf
= s->priv_data;
int res, pkt_size = 0, pkt_frames = 0;
int64_t left = CAF_MAX_PKT_SIZE;
int res, pkt_size = 0, pkt_frames = 0;
int64_t left = CAF_MAX_PKT_SIZE;
@@
-390,7
+390,7
@@
static int read_seek(AVFormatContext *s, int stream_index,
int64_t timestamp, int flags)
{
AVStream *st = s->streams[0];
int64_t timestamp, int flags)
{
AVStream *st = s->streams[0];
- Caf
f
Context *caf = s->priv_data;
+ CafContext *caf = s->priv_data;
int64_t pos, packet_cnt, frame_cnt;
timestamp = FFMAX(timestamp, 0);
int64_t pos, packet_cnt, frame_cnt;
timestamp = FFMAX(timestamp, 0);
@@
-422,7
+422,7
@@
static int read_seek(AVFormatContext *s, int stream_index,
AVInputFormat ff_caf_demuxer = {
.name = "caf",
.long_name = NULL_IF_CONFIG_SMALL("Apple CAF (Core Audio Format)"),
AVInputFormat ff_caf_demuxer = {
.name = "caf",
.long_name = NULL_IF_CONFIG_SMALL("Apple CAF (Core Audio Format)"),
- .priv_data_size = sizeof(Caf
f
Context),
+ .priv_data_size = sizeof(CafContext),
.read_probe = probe,
.read_header = read_header,
.read_packet = read_packet,
.read_probe = probe,
.read_header = read_header,
.read_packet = read_packet,