virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge commit '966689442ed843019dc0722a49bfb0ac51755d19'

Browse Source 
* commit '966689442ed843019dc0722a49bfb0ac51755d19':
  buffersink: K&R formatting cosmetics

Conflicts:
	libavfilter/buffersink.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-07-28 11:26:57 +02:00
parent 63c0113588 966689442e
commit edab63a406
1 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/buffersink.c
View File

@@ -173,7 +173,6 @@ static int read_from_fifo(AVFilterContext *ctx, AVFrame *frame,
av_frame_free(&tmp);
return 0;
}
int attribute_align_arg av_buffersink_get_samples(AVFilterContext *ctx,
@@ -218,7 +217,6 @@ int attribute_align_arg av_buffersink_get_samples(AVFilterContext *ctx,
}
return ret;
}
AVBufferSinkParams *av_buffersink_params_alloc(void)