generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '6ee55c7b111eec6c51dfdc0fddbd46f5dd867fa3'

Browse Source 
* commit '6ee55c7b111eec6c51dfdc0fddbd46f5dd867fa3':
  vf_transpose: K&R formatting cosmetics

Conflicts:
	libavfilter/vf_transpose.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-03-25 19:17:38 +01:00
parent 2d9821a208 6ee55c7b11
commit 10e931d514
1 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libavfilter/vf_transpose.c
View File

@@ -27,11 +27,12 @@
#include <stdio.h> #include <stdio.h>
#include "libavutil/intreadwrite.h"
#include "libavutil/pixdesc.h"
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "libavutil/internal.h" #include "libavutil/internal.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/pixdesc.h"
#include "avfilter.h" #include "avfilter.h"
#include "formats.h" #include "formats.h"
#include "internal.h" #include "internal.h"
@@ -111,12 +112,14 @@ static int config_props_output(AVFilterLink *outlink)
outlink->w = inlink->h; outlink->w = inlink->h;
outlink->h = inlink->w; outlink->h = inlink->w;
if (inlink->sample_aspect_ratio.num){ if (inlink->sample_aspect_ratio.num)
outlink->sample_aspect_ratio = av_div_q((AVRational){1,1}, inlink->sample_aspect_ratio); outlink->sample_aspect_ratio = av_div_q((AVRational) { 1, 1 },
} else inlink->sample_aspect_ratio);
else
outlink->sample_aspect_ratio = inlink->sample_aspect_ratio; outlink->sample_aspect_ratio = inlink->sample_aspect_ratio;
av_log(ctx, AV_LOG_VERBOSE, "w:%d h:%d dir:%d -> w:%d h:%d rotation:%s vflip:%d\n", av_log(ctx, AV_LOG_VERBOSE,
"w:%d h:%d dir:%d -> w:%d h:%d rotation:%s vflip:%d\n",
inlink->w, inlink->h, trans->dir, outlink->w, outlink->h, inlink->w, inlink->h, trans->dir, outlink->w, outlink->h,
trans->dir == 1 || trans->dir == 3 ? "clockwise" : "counterclockwise", trans->dir == 1 || trans->dir == 3 ? "clockwise" : "counterclockwise",
trans->dir == 0 || trans->dir == 3); trans->dir == 0 || trans->dir == 3);
@@ -182,7 +185,8 @@ static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr,
case 2: case 2:
for (y = start; y < end; y++, dst += dstlinesize) { for (y = start; y < end; y++, dst += dstlinesize) {
for (x = 0; x < outw; x++) for (x = 0; x < outw; x++)
*((uint16_t *)(dst + 2*x)) = *((uint16_t *)(src + x*srclinesize + y*2)); *((uint16_t *)(dst + 2 * x)) =
*((uint16_t *)(src + x * srclinesize + y * 2));
} }
break; break;
case 3: case 3:
@@ -196,7 +200,8 @@ static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr,
case 4: case 4:
for (y = start; y < end; y++, dst += dstlinesize) { for (y = start; y < end; y++, dst += dstlinesize) {
for (x = 0; x < outw; x++) for (x = 0; x < outw; x++)
*((uint32_t *)(dst + 4*x)) = *((uint32_t *)(src + x*srclinesize + y*4)); *((uint32_t *)(dst + 4 * x)) =
*((uint32_t *)(src + x * srclinesize + y * 4));
} }
break; break;
case 6: case 6: