virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-11 14:30:22 +02:00
Code Issues Releases Activity

avformat: fix style after recent commits

Browse Source
This commit is contained in:
Clément Bœsch
2015-09-14 17:42:12 +02:00
parent 1de21215d4
commit c8370a17f5
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/format.c
View File

@ -261,12 +261,12 @@ int av_probe_input_buffer2(AVIOContext *pb, AVInputFormat **fmt,
if (pb->av_class) { if (pb->av_class) {
uint8_t *mime_type_opt = NULL; uint8_t *mime_type_opt = NULL;
char* semi; char *semi;
av_opt_get(pb, "mime_type", AV_OPT_SEARCH_CHILDREN, &mime_type_opt); av_opt_get(pb, "mime_type", AV_OPT_SEARCH_CHILDREN, &mime_type_opt);
pd.mime_type = (const char *)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) { if (semi) {
*semi='\0'; *semi = '\0';
} }
} }
#if 0 #if 0

10
libavformat/mpjpegdec.c
View File

@ -43,12 +43,12 @@ static int get_line(AVIOContext *pb, char *line, int line_size)
static void trim_right(char* p) static void trim_right(char* p)
{ {
char* end; char *end;
if (!p || !*p) if (!p || !*p)
return; return;
end=p+strlen(p)-1; end = p + strlen(p) - 1;
while (end!=p && av_isspace(*end)) { while (end != p && av_isspace(*end)) {
*end='\0'; *end = '\0';
end--; end--;
} }
} }
@ -172,7 +172,7 @@ static int parse_multipart_header(AVIOContext *pb, void *log_ctx)
ret = get_line(pb, line, sizeof(line)); ret = get_line(pb, line, sizeof(line));
if (ret < 0) { if (ret < 0) {
if (ret==AVERROR_EOF) if (ret == AVERROR_EOF)
break; break;
return ret; return ret;
} }