[SCM] libav/experimental: dct/rdft: Add missing typedefs for context structs
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Aug 10 16:03:59 UTC 2014
The following commit has been merged in the experimental branch:
commit 11c7155cce50971a38e6cebd39a3ba5a54645fae
Author: Diego Biurrun <diego at biurrun.de>
Date: Fri Jul 18 06:07:26 2014 -0700
dct/rdft: Add missing typedefs for context structs
Without the typedefs there can be trouble depending on #include order.
diff --git a/libavcodec/dct.h b/libavcodec/dct.h
index 3fd4e27..24926a7 100644
--- a/libavcodec/dct.h
+++ b/libavcodec/dct.h
@@ -28,7 +28,7 @@
#include "rdft.h"
-struct DCTContext {
+typedef struct DCTContext {
int nbits;
int inverse;
RDFTContext rdft;
@@ -36,7 +36,7 @@ struct DCTContext {
FFTSample *csc2;
void (*dct_calc)(struct DCTContext *s, FFTSample *data);
void (*dct32)(FFTSample *out, const FFTSample *in);
-};
+} DCTContext;
/**
* Set up DCT.
diff --git a/libavcodec/rdft.h b/libavcodec/rdft.h
index 8ff620f..f9a23ff 100644
--- a/libavcodec/rdft.h
+++ b/libavcodec/rdft.h
@@ -48,7 +48,7 @@ extern SINTABLE(16384);
extern SINTABLE(32768);
extern SINTABLE(65536);
-struct RDFTContext {
+typedef struct RDFTContext {
int nbits;
int inverse;
int sign_convention;
@@ -58,7 +58,7 @@ struct RDFTContext {
SINTABLE_CONST FFTSample *tsin;
FFTContext fft;
void (*rdft_calc)(struct RDFTContext *s, FFTSample *z);
-};
+} RDFTContext;
/**
* Set up a real FFT.
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list