Michael Niedermayer 2b6185cac9 Merge commit 'b4d24b471bc52f1f78a43ee330199e70483e51c3' ...

* commit 'b4d24b471bc52f1f78a43ee330199e70483e51c3':
  build: Remove configure-generated .config file on distclean
  msmpeg4: Split decoding related functions to a separate file

Conflicts:
	Makefile
	libavcodec/Makefile
	libavcodec/msmpeg4.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-03-28 12:07:38 +01:00

49 KiB

Raw Blame History

View Raw