On Sat, Oct 4, 2014 at 12:53 PM, Luca Barbato <[email protected]> wrote: > --- > libavcodec/Makefile | 2 +- > libavcodec/vc1.h | 8 + > libavcodec/vc1_block.c | 1005 > +++--------------------------------------------- > libavcodec/vc1_mc.c | 964 ++++++++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 1018 insertions(+), 961 deletions(-) > create mode 100644 libavcodec/vc1_mc.c > > diff --git a/libavcodec/Makefile b/libavcodec/Makefile > index cda2426..53e84f9 100644 > --- a/libavcodec/Makefile > +++ b/libavcodec/Makefile > @@ -391,7 +391,7 @@ 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.o vc1data.o vc1dsp.o \ > + vc1_mc.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_mc.c b/libavcodec/vc1_mc.c > new file mode 100644 > index 0000000..1de5505 > --- /dev/null > +++ b/libavcodec/vc1_mc.c I have the same comment as the previous one, I'd not move code from one file to another too much. In my opinion squash it in a giant commit (unpopular) or leave it in the original file as much as possible. > @@ -0,0 +1,964 @@ > +/** > + * @file > + * VC-1 and WMV3 block decoding routines > + */ > + > +#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 "vc1data.h" > +#include "vc1acdata.h" > +#include "msmpeg4data.h" > +#include "unary.h" > +#include "mathops.h" karma *= order :p > +#undef NDEBUG > +#include <assert.h> > + > +#define MB_INTRA_VLC_BITS 9 > +#define DC_VLC_BITS 9 > + > +/** Do motion compensation over 1 macroblock -- Vittorio _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
