On Sat, Oct 4, 2014 at 12:53 PM, Luca Barbato <[email protected]> wrote: > --- > libavcodec/Makefile | 3 +- > libavcodec/vc1.h | 1 - > libavcodec/vc1_block.c | 1015 > ++---------------------------------------------- > libavcodec/vc1_pred.c | 969 +++++++++++++++++++++++++++++++++++++++++++++ > libavcodec/vc1_pred.h | 59 +++ > libavcodec/vc1data.h | 2 - > 6 files changed, 1066 insertions(+), 983 deletions(-) > create mode 100644 libavcodec/vc1_pred.c > create mode 100644 libavcodec/vc1_pred.h > > diff --git a/libavcodec/Makefile b/libavcodec/Makefile > index 53e84f9..1b3db07 100644 > --- a/libavcodec/Makefile > +++ b/libavcodec/Makefile > @@ -391,7 +391,8 @@ OBJS-$(CONFIG_V210X_DECODER) += v210x.o > OBJS-$(CONFIG_VB_DECODER) += vb.o > OBJS-$(CONFIG_VBLE_DECODER) += vble.o > OBJS-$(CONFIG_VC1_DECODER) += vc1dec.o vc1_block.o > vc1_loopfilter.o \ > - vc1_mc.o vc1.o vc1data.o vc1dsp.o \ > + vc1_mc.o vc1_pred.o vc1.o vc1data.o > \ > + vc1dsp.o \
alignment :) > msmpeg4dec.o msmpeg4.o > msmpeg4data.o > OBJS-$(CONFIG_VCR1_DECODER) += vcr1.o > OBJS-$(CONFIG_VMDAUDIO_DECODER) += vmdaudio.o > diff --git a/libavcodec/vc1.h b/libavcodec/vc1.h > index b4acc06..0c4958c 100644 > --- a/libavcodec/vc1.h > +++ b/libavcodec/vc1.h > @@ -412,5 +412,4 @@ void ff_vc1_mc_4mv_chroma4(VC1Context *v, int dir, int > dir2, int avg); > > void ff_vc1_interp_mc(VC1Context *v); > > - > #endif /* AVCODEC_VC1_H */ stray change? > diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c > index dc9cd97..00c3948 100644 > --- a/libavcodec/vc1_block.c > +++ b/libavcodec/vc1_block.c > @@ -36,6 +36,7 @@ > #include "h264chroma.h" > #include "qpeldsp.h" > #include "vc1.h" > +#include "vc1_pred.h" > #include "vc1data.h" > #include "vc1acdata.h" > #include "msmpeg4data.h" IMHO you could squash this in the patch that created this file > diff --git a/libavcodec/vc1_pred.c b/libavcodec/vc1_pred.c > new file mode 100644 > index 0000000..ce22e1f > --- /dev/null > +++ b/libavcodec/vc1_pred.c > @@ -0,0 +1,969 @@ > + > +#include "internal.h" > +#include "avcodec.h" > +#include "error_resilience.h" > +#include "mpeg_er.h" > +#include "mpegutils.h" > +#include "mpegvideo.h" > +#include "h263.h" > +#include "h264chroma.h" > +#include "qpeldsp.h" > +#include "vc1.h" > +#include "vc1_pred.h" > +#include "vc1data.h" > +#include "vc1acdata.h" > +#include "msmpeg4data.h" > +#include "unary.h" > +#include "mathops.h" karma = pow(karma, order) I have the same "issue" as the previous ones, but (at the last patch) I see the whole picture. I guess there can't be really any other way, can it? Set ok if oracle is happy. Thanks for tackling this huge beast. -- Vittorio _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
