Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '4d5b99dacdbb56373e5abe2ad35fc87b5c0c5bd2'

Browse Source 
* commit '4d5b99dacdbb56373e5abe2ad35fc87b5c0c5bd2':
  caf: Give context structure a consistent name

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/86/head
Michael Niedermayer 10 years ago
parent f2254e36c0 4d5b99dacd
commit b0458e62c8
1 changed files with 7 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      libavformat/cafdec.c

14
libavformat/cafdec.c
Unescape View File

@ -46,7 +46,7 @@ typedef struct {
int64_t data_start; ///< data start position, in bytes int64_t data_start; ///< data start position, in bytes
int64_t data_size; ///< raw data size, in bytes int64_t data_size; ///< raw data size, in bytes
} CaffContext; } 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) static int read_desc_chunk(AVFormatContext *s)
{ {
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
CaffContext *caf = s->priv_data; CafContext *caf = s->priv_data;
AVStream *st; AVStream *st;
int flags; int flags;
@ -167,7 +167,7 @@ static int read_pakt_chunk(AVFormatContext *s, int64_t size)
{ {
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
AVStream *st = s->streams[0]; AVStream *st = s->streams[0];
CaffContext *caf = s->priv_data; CafContext *caf = s->priv_data;
int64_t pos = 0, ccount, num_packets; int64_t pos = 0, ccount, num_packets;
int i; int i;
@ -216,7 +216,7 @@ static void read_info_chunk(AVFormatContext *s, int64_t size)
static int read_header(AVFormatContext *s) static int read_header(AVFormatContext *s)
{ {
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
CaffContext *caf = s->priv_data; CafContext *caf = s->priv_data;
AVStream *st; AVStream *st;
uint32_t tag = 0; uint32_t tag = 0;
int found_data, ret; int found_data, ret;
@ -334,7 +334,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
{ {
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
AVStream *st = s->streams[0]; AVStream *st = s->streams[0];
CaffContext *caf = s->priv_data; CafContext *caf = s->priv_data;
int res, pkt_size = 0, pkt_frames = 0; int res, pkt_size = 0, pkt_frames = 0;
int64_t left = CAF_MAX_PKT_SIZE; 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) int64_t timestamp, int flags)
{ {
AVStream *st = s->streams[0]; AVStream *st = s->streams[0];
CaffContext *caf = s->priv_data; CafContext *caf = s->priv_data;
int64_t pos, packet_cnt, frame_cnt; int64_t pos, packet_cnt, frame_cnt;
timestamp = FFMAX(timestamp, 0); timestamp = FFMAX(timestamp, 0);
@ -422,7 +422,7 @@ static int read_seek(AVFormatContext *s, int stream_index,
AVInputFormat ff_caf_demuxer = { AVInputFormat ff_caf_demuxer = {
.name = "caf", .name = "caf",
.long_name = NULL_IF_CONFIG_SMALL("Apple CAF (Core Audio Format)"), .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_probe = probe,
.read_header = read_header, .read_header = read_header,
.read_packet = read_packet, .read_packet = read_packet,

Write Preview
Loading…
Cancel
Save