diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-02 21:44:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-02 21:44:44 +0100 |
| commit | 411f8f4c9a05796e22e12bf0a22c967f28c2d430 (patch) | |
| tree | 6443c412bc0e64ad2e0b8eb27b19ecc552427913 /libavformat/assdec.c | |
| parent | dfefc9097e9b4bb20442e65454a40043bd189b3d (diff) | |
| parent | 5c9c305d14730faf2af206e5d519df4948de0ed2 (diff) | |
| download | ffmpeg-411f8f4c9a05796e22e12bf0a22c967f28c2d430.tar.gz | |
Merge commit '5c9c305d14730faf2af206e5d519df4948de0ed2'
* commit '5c9c305d14730faf2af206e5d519df4948de0ed2':
ass: K&R formatting cosmetics
Conflicts:
libavformat/assdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/assdec.c')
| -rw-r--r-- | libavformat/assdec.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libavformat/assdec.c b/libavformat/assdec.c index c9bd63b3c4..bb953c7276 100644 --- a/libavformat/assdec.c +++ b/libavformat/assdec.c @@ -27,16 +27,16 @@ #include "libavcodec/internal.h" #include "libavutil/bprint.h" -typedef struct ASSContext{ +typedef struct ASSContext { FFDemuxSubtitlesQueue q; -}ASSContext; +} ASSContext; static int ass_probe(AVProbeData *p) { - const char *header= "[Script Info]"; + const char *header = "[Script Info]"; - if( !memcmp(p->buf , header, strlen(header)) - || !memcmp(p->buf+3, header, strlen(header))) + if (!memcmp(p->buf, header, strlen(header)) || + !memcmp(p->buf + 3, header, strlen(header))) return AVPROBE_SCORE_MAX; return 0; @@ -94,9 +94,9 @@ static int ass_read_header(AVFormatContext *s) return AVERROR(ENOMEM); avpriv_set_pts_info(st, 64, 1, 100); st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; - st->codec->codec_id= AV_CODEC_ID_SSA; + st->codec->codec_id = AV_CODEC_ID_SSA; - header_remaining= INT_MAX; + header_remaining = INT_MAX; av_bprint_init(&header, 0, AV_BPRINT_SIZE_UNLIMITED); av_bprint_init(&line, 0, AV_BPRINT_SIZE_UNLIMITED); @@ -108,9 +108,9 @@ static int ass_read_header(AVFormatContext *s) break; if (!memcmp(line.str, "[Events]", 8)) - header_remaining= 2; - else if (line.str[0]=='[') - header_remaining= INT_MAX; + header_remaining = 2; + else if (line.str[0] == '[') + header_remaining = INT_MAX; if (header_remaining) { av_bprintf(&header, "%s", line.str); |