[FFmpeg-cvslog] Merge commit 'b4d24b471bc52f1f78a43ee330199e70483e51c3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 28 12:04:53 2013 +0100| [2b6185cac945b73616b55dd6a4a8f9e96486320e] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2b6185cac945b73616b55dd6a4a8f9e96486320e
---