[FFmpeg-cvslog] lavfi/framepool: re-indent after previous commit
Matthieu Bouron
git at videolan.org
Thu Jan 12 11:36:48 EET 2017
ffmpeg | branch: master | Matthieu Bouron <matthieu.bouron at gmail.com> | Tue Jan 3 17:44:55 2017 +0100| [e2d336cf6499923691baf53b10d193aefa77fa89] | committer: Matthieu Bouron
lavfi/framepool: re-indent after previous commit
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e2d336cf6499923691baf53b10d193aefa77fa89
---
libavfilter/framepool.c | 54 ++++++++++++++++++++++++-------------------------
1 file changed, 27 insertions(+), 27 deletions(-)
diff --git a/libavfilter/framepool.c b/libavfilter/framepool.c
index 588dcb6..74235d4 100644
--- a/libavfilter/framepool.c
+++ b/libavfilter/framepool.c
@@ -205,41 +205,41 @@ AVFrame *ff_frame_pool_get(FFFramePool *pool)
switch(pool->type) {
case AVMEDIA_TYPE_VIDEO:
- desc = av_pix_fmt_desc_get(pool->format);
- if (!desc) {
- goto fail;
- }
+ desc = av_pix_fmt_desc_get(pool->format);
+ if (!desc) {
+ goto fail;
+ }
- frame->width = pool->width;
- frame->height = pool->height;
- frame->format = pool->format;
+ frame->width = pool->width;
+ frame->height = pool->height;
+ frame->format = pool->format;
- for (i = 0; i < 4; i++) {
- frame->linesize[i] = pool->linesize[i];
- if (!pool->pools[i])
- break;
+ for (i = 0; i < 4; i++) {
+ frame->linesize[i] = pool->linesize[i];
+ if (!pool->pools[i])
+ break;
- frame->buf[i] = av_buffer_pool_get(pool->pools[i]);
- if (!frame->buf[i]) {
- goto fail;
- }
+ frame->buf[i] = av_buffer_pool_get(pool->pools[i]);
+ if (!frame->buf[i]) {
+ goto fail;
+ }
- frame->data[i] = frame->buf[i]->data;
- }
+ frame->data[i] = frame->buf[i]->data;
+ }
- if (desc->flags & AV_PIX_FMT_FLAG_PAL ||
- desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) {
- enum AVPixelFormat format =
- pool->format == AV_PIX_FMT_PAL8 ? AV_PIX_FMT_BGR8 : pool->format;
+ if (desc->flags & AV_PIX_FMT_FLAG_PAL ||
+ desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) {
+ enum AVPixelFormat format =
+ pool->format == AV_PIX_FMT_PAL8 ? AV_PIX_FMT_BGR8 : pool->format;
- av_assert0(frame->data[1] != NULL);
- if (avpriv_set_systematic_pal2((uint32_t *)frame->data[1], format) < 0) {
- goto fail;
+ av_assert0(frame->data[1] != NULL);
+ if (avpriv_set_systematic_pal2((uint32_t *)frame->data[1], format) < 0) {
+ goto fail;
+ }
}
- }
- frame->extended_data = frame->data;
- break;
+ frame->extended_data = frame->data;
+ break;
case AVMEDIA_TYPE_AUDIO:
frame->nb_samples = pool->nb_samples;
av_frame_set_channels(frame, pool->channels);
More information about the ffmpeg-cvslog
mailing list