generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki 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
commit edab63a406
1 changed files with 18 additions and 20 deletions

2
libavfilter/buffersink.c

@ -173,7 +173,6 @@ static int read_from_fifo(AVFilterContext *ctx, AVFrame *frame,
av_frame_free(&tmp); av_frame_free(&tmp);
return 0; return 0;
} }
int attribute_align_arg av_buffersink_get_samples(AVFilterContext *ctx, 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; return ret;
} }
AVBufferSinkParams *av_buffersink_params_alloc(void) AVBufferSinkParams *av_buffersink_params_alloc(void)