From c8370a17f57f54acd6aaf53c28913202894d1663 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Mon, 14 Sep 2015 17:42:12 +0200 Subject: [PATCH] avformat: fix style after recent commits --- libavformat/format.c | 6 +++--- libavformat/mpjpegdec.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libavformat/format.c b/libavformat/format.c index d9b8989b03..fd81d7a132 100644 --- a/libavformat/format.c +++ b/libavformat/format.c @@ -261,12 +261,12 @@ int av_probe_input_buffer2(AVIOContext *pb, AVInputFormat **fmt, if (pb->av_class) { uint8_t *mime_type_opt = NULL; - char* semi; + char *semi; av_opt_get(pb, "mime_type", AV_OPT_SEARCH_CHILDREN, &mime_type_opt); pd.mime_type = (const char *)mime_type_opt; - semi = pd.mime_type?strchr(pd.mime_type, ';'):NULL; + semi = pd.mime_type ? strchr(pd.mime_type, ';') : NULL; if (semi) { - *semi='\0'; + *semi = '\0'; } } #if 0 diff --git a/libavformat/mpjpegdec.c b/libavformat/mpjpegdec.c index 4ce90ce6ba..d9553040e8 100644 --- a/libavformat/mpjpegdec.c +++ b/libavformat/mpjpegdec.c @@ -43,12 +43,12 @@ static int get_line(AVIOContext *pb, char *line, int line_size) static void trim_right(char* p) { - char* end; + char *end; if (!p || !*p) return; - end=p+strlen(p)-1; - while (end!=p && av_isspace(*end)) { - *end='\0'; + end = p + strlen(p) - 1; + while (end != p && av_isspace(*end)) { + *end = '\0'; end--; } } @@ -172,7 +172,7 @@ static int parse_multipart_header(AVIOContext *pb, void *log_ctx) ret = get_line(pb, line, sizeof(line)); if (ret < 0) { - if (ret==AVERROR_EOF) + if (ret == AVERROR_EOF) break; return ret; }