breeze/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-02-04 14:30:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'

Browse Source 
* commit '58400ac133bcfb6bf8196b4e5208bc178307739b':
  lavfi: name anonymous structs

Conflicts:
	libavfilter/buffersink.c
	libavfilter/f_select.c
	libavfilter/src_movie.c
	libavfilter/vf_drawbox.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_overlay.c
	libavfilter/vf_showinfo.c
	libavfilter/vf_unsharp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-04-19 18:20:17 +02:00
parent 010732b73a 58400ac133
commit 74a8dbe1c4
33 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavfilter/vsrc_testsrc.c
View File

@@ -47,7 +47,7 @@
#include "internal.h"
#include "video.h"
typedef struct {
typedef struct TestSourceContext {
const AVClass *class;
int w, h;
unsigned int nb_frame;
@@ -488,7 +488,7 @@ static void draw_digit(int digit, uint8_t *dst, int dst_linesize,
#define LEFT_BOT_VBAR 16
#define RIGHT_TOP_VBAR 32
#define RIGHT_BOT_VBAR 64
struct {
struct segments {
int x, y, w, h;
} segments[] = {
{ 1, 0, 5, 1 }, /* TOP_HBAR */