Merge commit 'b4d24b471bc52f1f78a43ee330199e70483e51c3'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Mar 2013 11:04:53 +0000 (12:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Mar 2013 11:07:38 +0000 (12:07 +0100)
commit2b6185cac945b73616b55dd6a4a8f9e96486320e
tree400649d4707e01e5ea095836dc495e8f605c279c
parent2bfcd74ad3e331e995755ac865abc370d3e544c8
parentb4d24b471bc52f1f78a43ee330199e70483e51c3
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>
Makefile
libavcodec/Makefile
libavcodec/msmpeg4.c
libavcodec/msmpeg4dec.c