Browse Source

lavfi: name anonymous structs

tags/n2.3
Vittorio Giovara 12 years ago
parent
commit
58400ac133
34 changed files with 40 additions and 40 deletions
  1. +1
    -1
      libavfilter/buffersink.c
  2. +1
    -1
      libavfilter/buffersrc.c
  3. +1
    -1
      libavfilter/fifo.c
  4. +1
    -1
      libavfilter/setpts.c
  5. +1
    -1
      libavfilter/settb.c
  6. +1
    -1
      libavfilter/vf_aspect.c
  7. +1
    -1
      libavfilter/vf_blackframe.c
  8. +2
    -2
      libavfilter/vf_boxblur.c
  9. +1
    -1
      libavfilter/vf_crop.c
  10. +1
    -1
      libavfilter/vf_cropdetect.c
  11. +1
    -1
      libavfilter/vf_delogo.c
  12. +1
    -1
      libavfilter/vf_drawbox.c
  13. +2
    -2
      libavfilter/vf_drawtext.c
  14. +1
    -1
      libavfilter/vf_fade.c
  15. +1
    -1
      libavfilter/vf_fieldorder.c
  16. +1
    -1
      libavfilter/vf_format.c
  17. +1
    -1
      libavfilter/vf_hflip.c
  18. +1
    -1
      libavfilter/vf_hqdn3d.h
  19. +1
    -1
      libavfilter/vf_interlace.c
  20. +4
    -4
      libavfilter/vf_libopencv.c
  21. +1
    -1
      libavfilter/vf_lut.c
  22. +1
    -1
      libavfilter/vf_overlay.c
  23. +1
    -1
      libavfilter/vf_pad.c
  24. +1
    -1
      libavfilter/vf_pixdesctest.c
  25. +1
    -1
      libavfilter/vf_scale.c
  26. +1
    -1
      libavfilter/vf_select.c
  27. +1
    -1
      libavfilter/vf_showinfo.c
  28. +1
    -1
      libavfilter/vf_transpose.c
  29. +1
    -1
      libavfilter/vf_unsharp.c
  30. +1
    -1
      libavfilter/vf_vflip.c
  31. +1
    -1
      libavfilter/vsrc_color.c
  32. +1
    -1
      libavfilter/vsrc_movie.c
  33. +1
    -1
      libavfilter/vsrc_nullsrc.c
  34. +2
    -2
      libavfilter/vsrc_testsrc.c

+ 1
- 1
libavfilter/buffersink.c View File

@@ -35,7 +35,7 @@
#include "buffersink.h" #include "buffersink.h"
#include "internal.h" #include "internal.h"


typedef struct {
typedef struct BufferSinkContext {
AVFrame *cur_frame; ///< last frame delivered on the sink AVFrame *cur_frame; ///< last frame delivered on the sink
AVAudioFifo *audio_fifo; ///< FIFO for audio samples AVAudioFifo *audio_fifo; ///< FIFO for audio samples
int64_t next_pts; ///< interpolating audio pts int64_t next_pts; ///< interpolating audio pts


+ 1
- 1
libavfilter/buffersrc.c View File

@@ -40,7 +40,7 @@
#include "internal.h" #include "internal.h"
#include "video.h" #include "video.h"


typedef struct {
typedef struct BufferSourceContext {
const AVClass *class; const AVClass *class;
AVFifoBuffer *fifo; AVFifoBuffer *fifo;
AVRational time_base; ///< time_base to set in the output link AVRational time_base; ///< time_base to set in the output link


+ 1
- 1
libavfilter/fifo.c View File

@@ -39,7 +39,7 @@ typedef struct Buf {
struct Buf *next; struct Buf *next;
} Buf; } Buf;


typedef struct {
typedef struct FifoContext {
Buf root; Buf root;
Buf *last; ///< last buffered frame Buf *last; ///< last buffered frame




+ 1
- 1
libavfilter/setpts.c View File

@@ -73,7 +73,7 @@ enum var_name {
VAR_VARS_NB VAR_VARS_NB
}; };


typedef struct {
typedef struct SetPTSContext {
const AVClass *class; const AVClass *class;
char *expr_str; char *expr_str;
AVExpr *expr; AVExpr *expr;


+ 1
- 1
libavfilter/settb.c View File

@@ -57,7 +57,7 @@ enum var_name {
VAR_VARS_NB VAR_VARS_NB
}; };


typedef struct {
typedef struct SetTBContext {
const AVClass *class; const AVClass *class;
char *tb_expr; char *tb_expr;
double var_values[VAR_VARS_NB]; double var_values[VAR_VARS_NB];


+ 1
- 1
libavfilter/vf_aspect.c View File

@@ -62,7 +62,7 @@ enum var_name {
VARS_NB VARS_NB
}; };


typedef struct {
typedef struct AspectContext {
const AVClass *class; const AVClass *class;
AVRational dar; AVRational dar;
AVRational sar; AVRational sar;


+ 1
- 1
libavfilter/vf_blackframe.c View File

@@ -38,7 +38,7 @@
#include "internal.h" #include "internal.h"
#include "video.h" #include "video.h"


typedef struct {
typedef struct BlackFrameContext {
const AVClass *class; const AVClass *class;
int bamount; ///< black amount int bamount; ///< black amount
int bthresh; ///< black threshold int bthresh; ///< black threshold


+ 2
- 2
libavfilter/vf_boxblur.c View File

@@ -55,12 +55,12 @@ enum var_name {
VARS_NB VARS_NB
}; };


typedef struct {
typedef struct FilterParam {
int radius; int radius;
int power; int power;
} FilterParam; } FilterParam;


typedef struct {
typedef struct BoxBlurContext {
const AVClass *class; const AVClass *class;
FilterParam luma_param; FilterParam luma_param;
FilterParam chroma_param; FilterParam chroma_param;


+ 1
- 1
libavfilter/vf_crop.c View File

@@ -68,7 +68,7 @@ enum var_name {
VAR_VARS_NB VAR_VARS_NB
}; };


typedef struct {
typedef struct CropContext {
const AVClass *class; const AVClass *class;
int x; ///< x offset of the non-cropped area with respect to the input area int x; ///< x offset of the non-cropped area with respect to the input area
int y; ///< y offset of the non-cropped area with respect to the input area int y; ///< y offset of the non-cropped area with respect to the input area


+ 1
- 1
libavfilter/vf_cropdetect.c View File

@@ -34,7 +34,7 @@
#include "internal.h" #include "internal.h"
#include "video.h" #include "video.h"


typedef struct {
typedef struct CropDetectContext {
const AVClass *class; const AVClass *class;
int x1, y1, x2, y2; int x1, y1, x2, y2;
int limit; int limit;


+ 1
- 1
libavfilter/vf_delogo.c View File

@@ -130,7 +130,7 @@ static void apply_delogo(uint8_t *dst, int dst_linesize,
} }
} }


typedef struct {
typedef struct DelogoContext {
const AVClass *class; const AVClass *class;
int x, y, w, h, band, show; int x, y, w, h, band, show;
} DelogoContext; } DelogoContext;


+ 1
- 1
libavfilter/vf_drawbox.c View File

@@ -36,7 +36,7 @@


enum { Y, U, V, A }; enum { Y, U, V, A };


typedef struct {
typedef struct DrawBoxContext {
const AVClass *class; const AVClass *class;
int x, y, w_opt, h_opt, w, h; int x, y, w_opt, h_opt, w, h;
char *color_str; char *color_str;


+ 2
- 2
libavfilter/vf_drawtext.c View File

@@ -105,7 +105,7 @@ enum var_name {
VAR_VARS_NB VAR_VARS_NB
}; };


typedef struct {
typedef struct DrawTextContext {
const AVClass *class; const AVClass *class;
#if CONFIG_LIBFONTCONFIG #if CONFIG_LIBFONTCONFIG
uint8_t *font; ///< font to be used uint8_t *font; ///< font to be used
@@ -223,7 +223,7 @@ struct ft_error


#define FT_ERRMSG(e) ft_errors[e].err_msg #define FT_ERRMSG(e) ft_errors[e].err_msg


typedef struct {
typedef struct Glyph {
FT_Glyph *glyph; FT_Glyph *glyph;
uint32_t code; uint32_t code;
FT_Bitmap bitmap; ///< array holding bitmaps of font FT_Bitmap bitmap; ///< array holding bitmaps of font


+ 1
- 1
libavfilter/vf_fade.c View File

@@ -36,7 +36,7 @@
#define FADE_IN 0 #define FADE_IN 0
#define FADE_OUT 1 #define FADE_OUT 1


typedef struct {
typedef struct FadeContext {
const AVClass *class; const AVClass *class;
int type; int type;
int factor, fade_per_frame; int factor, fade_per_frame;


+ 1
- 1
libavfilter/vf_fieldorder.c View File

@@ -35,7 +35,7 @@
#include "internal.h" #include "internal.h"
#include "video.h" #include "video.h"


typedef struct {
typedef struct FieldOrderContext {
const AVClass *class; const AVClass *class;
int dst_tff; ///< output bff/tff int dst_tff; ///< output bff/tff
int line_size[4]; ///< bytes of pixel data per line for each plane int line_size[4]; ///< bytes of pixel data per line for each plane


+ 1
- 1
libavfilter/vf_format.c View File

@@ -35,7 +35,7 @@
#include "internal.h" #include "internal.h"
#include "video.h" #include "video.h"


typedef struct {
typedef struct FormatContext {
const AVClass *class; const AVClass *class;
char *pix_fmts; char *pix_fmts;
/** /**


+ 1
- 1
libavfilter/vf_hflip.c View File

@@ -35,7 +35,7 @@
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"


typedef struct {
typedef struct FlipContext {
int max_step[4]; ///< max pixel step for each plane, expressed as a number of bytes int max_step[4]; ///< max pixel step for each plane, expressed as a number of bytes
int hsub, vsub; ///< chroma subsampling int hsub, vsub; ///< chroma subsampling
} FlipContext; } FlipContext;


+ 1
- 1
libavfilter/vf_hqdn3d.h View File

@@ -24,7 +24,7 @@


#include "libavutil/opt.h" #include "libavutil/opt.h"


typedef struct {
typedef struct HQDN3DContext {
const AVClass *class; const AVClass *class;
int16_t *coefs[4]; int16_t *coefs[4];
uint16_t *line; uint16_t *line;


+ 1
- 1
libavfilter/vf_interlace.c View File

@@ -42,7 +42,7 @@ enum FieldType {
FIELD_LOWER = 1, FIELD_LOWER = 1,
}; };


typedef struct {
typedef struct InterlaceContext {
const AVClass *class; const AVClass *class;
enum ScanMode scan; // top or bottom field first scanning enum ScanMode scan; // top or bottom field first scanning
#if FF_API_INTERLACE_LOWPASS_SET #if FF_API_INTERLACE_LOWPASS_SET


+ 4
- 4
libavfilter/vf_libopencv.c View File

@@ -68,7 +68,7 @@ static int query_formats(AVFilterContext *ctx)
return 0; return 0;
} }


typedef struct {
typedef struct OCVContext {
const AVClass *class; const AVClass *class;
char *name; char *name;
char *params; char *params;
@@ -78,7 +78,7 @@ typedef struct {
void *priv; void *priv;
} OCVContext; } OCVContext;


typedef struct {
typedef struct SmoothContext {
int type; int type;
int param1, param2; int param1, param2;
double param3, param4; double param3, param4;
@@ -245,7 +245,7 @@ static int parse_iplconvkernel(IplConvKernel **kernel, char *buf, void *log_ctx)
return 0; return 0;
} }


typedef struct {
typedef struct DilateContext {
int nb_iterations; int nb_iterations;
IplConvKernel *kernel; IplConvKernel *kernel;
} DilateContext; } DilateContext;
@@ -301,7 +301,7 @@ static void erode_end_frame_filter(AVFilterContext *ctx, IplImage *inimg, IplIma
cvErode(inimg, outimg, dilate->kernel, dilate->nb_iterations); cvErode(inimg, outimg, dilate->kernel, dilate->nb_iterations);
} }


typedef struct {
typedef struct OCVFilterEntry {
const char *name; const char *name;
size_t priv_size; size_t priv_size;
int (*init)(AVFilterContext *ctx, const char *args); int (*init)(AVFilterContext *ctx, const char *args);


+ 1
- 1
libavfilter/vf_lut.c View File

@@ -63,7 +63,7 @@ enum var_name {
VAR_VARS_NB VAR_VARS_NB
}; };


typedef struct {
typedef struct LutContext {
const AVClass *class; const AVClass *class;
uint8_t lut[4][256]; ///< lookup table for each component uint8_t lut[4][256]; ///< lookup table for each component
char *comp_expr_str[4]; char *comp_expr_str[4];


+ 1
- 1
libavfilter/vf_overlay.c View File

@@ -73,7 +73,7 @@ static const char *eof_action_str[] = {
#define MAIN 0 #define MAIN 0
#define OVERLAY 1 #define OVERLAY 1


typedef struct {
typedef struct OverlayContext {
const AVClass *class; const AVClass *class;
int x, y; ///< position of overlayed picture int x, y; ///< position of overlayed picture




+ 1
- 1
libavfilter/vf_pad.c View File

@@ -94,7 +94,7 @@ static int query_formats(AVFilterContext *ctx)
return 0; return 0;
} }


typedef struct {
typedef struct PadContext {
const AVClass *class; const AVClass *class;
int w, h; ///< output dimensions, a value of 0 will result in the input size int w, h; ///< output dimensions, a value of 0 will result in the input size
int x, y; ///< offsets of the input area with respect to the padded area int x, y; ///< offsets of the input area with respect to the padded area


+ 1
- 1
libavfilter/vf_pixdesctest.c View File

@@ -29,7 +29,7 @@
#include "internal.h" #include "internal.h"
#include "video.h" #include "video.h"


typedef struct {
typedef struct PixdescTestContext {
const AVPixFmtDescriptor *pix_desc; const AVPixFmtDescriptor *pix_desc;
uint16_t *line; uint16_t *line;
} PixdescTestContext; } PixdescTestContext;


+ 1
- 1
libavfilter/vf_scale.c View File

@@ -68,7 +68,7 @@ enum var_name {
VARS_NB VARS_NB
}; };


typedef struct {
typedef struct ScaleContext {
const AVClass *class; const AVClass *class;
struct SwsContext *sws; ///< software scaler context struct SwsContext *sws; ///< software scaler context




+ 1
- 1
libavfilter/vf_select.c View File

@@ -115,7 +115,7 @@ enum var_name {


#define FIFO_SIZE 8 #define FIFO_SIZE 8


typedef struct {
typedef struct SelectContext {
const AVClass *class; const AVClass *class;
char *expr_str; char *expr_str;
AVExpr *expr; AVExpr *expr;


+ 1
- 1
libavfilter/vf_showinfo.c View File

@@ -34,7 +34,7 @@
#include "internal.h" #include "internal.h"
#include "video.h" #include "video.h"


typedef struct {
typedef struct ShowInfoContext {
unsigned int frame; unsigned int frame;
} ShowInfoContext; } ShowInfoContext;




+ 1
- 1
libavfilter/vf_transpose.c View File

@@ -45,7 +45,7 @@ enum TransposeDir {
TRANSPOSE_CLOCK_FLIP, TRANSPOSE_CLOCK_FLIP,
}; };


typedef struct {
typedef struct TransContext {
const AVClass *class; const AVClass *class;
int hsub, vsub; int hsub, vsub;
int pixsteps[4]; int pixsteps[4];


+ 1
- 1
libavfilter/vf_unsharp.c View File

@@ -62,7 +62,7 @@ typedef struct FilterParam {
uint32_t *sc[(MAX_SIZE * MAX_SIZE) - 1]; ///< finite state machine storage uint32_t *sc[(MAX_SIZE * MAX_SIZE) - 1]; ///< finite state machine storage
} FilterParam; } FilterParam;


typedef struct {
typedef struct UnsharpContext {
const AVClass *class; const AVClass *class;
int lmsize_x, lmsize_y, cmsize_x, cmsize_y; int lmsize_x, lmsize_y, cmsize_x, cmsize_y;
float lamount, camount; float lamount, camount;


+ 1
- 1
libavfilter/vf_vflip.c View File

@@ -29,7 +29,7 @@
#include "internal.h" #include "internal.h"
#include "video.h" #include "video.h"


typedef struct {
typedef struct FlipContext {
int vsub; ///< vertical chroma subsampling int vsub; ///< vertical chroma subsampling
} FlipContext; } FlipContext;




+ 1
- 1
libavfilter/vsrc_color.c View File

@@ -40,7 +40,7 @@
#include "libavutil/parseutils.h" #include "libavutil/parseutils.h"
#include "drawutils.h" #include "drawutils.h"


typedef struct {
typedef struct ColorContext {
const AVClass *class; const AVClass *class;
int w, h; int w, h;
uint8_t color[4]; uint8_t color[4];


+ 1
- 1
libavfilter/vsrc_movie.c View File

@@ -41,7 +41,7 @@
#include "internal.h" #include "internal.h"
#include "video.h" #include "video.h"


typedef struct {
typedef struct MovieContext {
const AVClass *class; const AVClass *class;
int64_t seek_point; ///< seekpoint in microseconds int64_t seek_point; ///< seekpoint in microseconds
double seek_point_d; double seek_point_d;


+ 1
- 1
libavfilter/vsrc_nullsrc.c View File

@@ -49,7 +49,7 @@ enum var_name {
VAR_VARS_NB VAR_VARS_NB
}; };


typedef struct {
typedef struct NullContext {
const AVClass *class; const AVClass *class;
int w, h; int w, h;
char *tb_expr; char *tb_expr;


+ 2
- 2
libavfilter/vsrc_testsrc.c View File

@@ -42,7 +42,7 @@
#include "internal.h" #include "internal.h"
#include "video.h" #include "video.h"


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


Loading…
Cancel
Save