aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2014-09-25 16:42:30 +0200
committerDiego Biurrun <diego@biurrun.de>2014-09-26 00:44:41 -0700
commit4d5b99dacdbb56373e5abe2ad35fc87b5c0c5bd2 (patch)
tree470a3814fc4baa3600f0684ff5268f86526cba9d
parent4620affa24eedb167482198aa04126bcedd05620 (diff)
downloadffmpeg-4d5b99dacdbb56373e5abe2ad35fc87b5c0c5bd2.tar.gz
caf: Give context structure a consistent name
-rw-r--r--libavformat/cafdec.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c
index 0034f001d0..4489eb26b2 100644
--- a/libavformat/cafdec.c
+++ b/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
-} CaffContext;
+} CafContext;
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;
- CaffContext *caf = s->priv_data;
+ CafContext *caf = s->priv_data;
AVStream *st;
int flags;
@@ -172,7 +172,7 @@ static int read_pakt_chunk(AVFormatContext *s, int64_t size)
{
AVIOContext *pb = s->pb;
AVStream *st = s->streams[0];
- CaffContext *caf = s->priv_data;
+ CafContext *caf = s->priv_data;
int64_t pos = 0, ccount, num_packets;
int i;
@@ -221,7 +221,7 @@ static void read_info_chunk(AVFormatContext *s, int64_t size)
static int read_header(AVFormatContext *s)
{
AVIOContext *pb = s->pb;
- CaffContext *caf = s->priv_data;
+ CafContext *caf = s->priv_data;
AVStream *st;
uint32_t tag = 0;
int found_data, ret;
@@ -333,7 +333,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
{
AVIOContext *pb = s->pb;
AVStream *st = s->streams[0];
- CaffContext *caf = s->priv_data;
+ CafContext *caf = s->priv_data;
int res, pkt_size = 0, pkt_frames = 0;
int64_t left = CAF_MAX_PKT_SIZE;
@@ -387,7 +387,7 @@ static int read_seek(AVFormatContext *s, int stream_index,
int64_t timestamp, int flags)
{
AVStream *st = s->streams[0];
- CaffContext *caf = s->priv_data;
+ CafContext *caf = s->priv_data;
int64_t pos, packet_cnt, frame_cnt;
timestamp = FFMAX(timestamp, 0);
@@ -419,7 +419,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)"),
- .priv_data_size = sizeof(CaffContext),
+ .priv_data_size = sizeof(CafContext),
.read_probe = probe,
.read_header = read_header,
.read_packet = read_packet,