summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-28 12:04:53 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-28 12:07:38 +0100
commit2b6185cac945b73616b55dd6a4a8f9e96486320e (patch)
tree400649d4707e01e5ea095836dc495e8f605c279c /Makefile
parent2bfcd74ad3e331e995755ac865abc370d3e544c8 (diff)
parentb4d24b471bc52f1f78a43ee330199e70483e51c3 (diff)
downloadffmpeg-streaming-2b6185cac945b73616b55dd6a4a8f9e96486320e.zip
ffmpeg-streaming-2b6185cac945b73616b55dd6a4a8f9e96486320e.tar.gz
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>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index d12a9a9..2cafd40 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ clean::
distclean::
$(RM) $(DISTCLEANSUFFIXES)
- $(RM) config.* .version version.h libavutil/avconfig.h libavcodec/codec_names.h
+ $(RM) config.* .config libavutil/avconfig.h .version version.h libavcodec/codec_names.h
config:
$(SRC_PATH)/configure $(value FFMPEG_CONFIGURATION)
OpenPOWER on IntegriCloud