summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGavin Hurlbut <ghurlbut@mythtv.org>2011-04-25 06:46:46 (GMT)
committer Stuart Morgan <smorgan@mythtv.org>2011-05-15 20:57:52 (GMT)
commitb5a3805b92624dc91c0289162600ad7129f291e6 (patch)
treee26b661275b9a24ef8544782bb033ae8f2b8cbf9
parent298e34308332bb936edaf12e40f96ca85be5ad14 (diff)
Make ffmpeg's version.sh run in the ffmpeg dirv0.24.1
It seems both our code and ffmpeg's code use version.sh, and read VERSION. The problem was that that minor difference was missed in merging the ffmpeg makefile and we were reading MythTV's VERSION inside ffmpeg, creating crappy version.h Thanks to superm and xris for finding this before the hustle of a release when VERSION is normally used. (cherry picked from commit 864e8dbce38ed3811856219634290c7d3226fe7c) Signed-off-by: Stuart Morgan <smorgan@mythtv.org>
-rw-r--r--mythtv/external/FFmpeg/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/mythtv/external/FFmpeg/Makefile b/mythtv/external/FFmpeg/Makefile
index 6afaff5..05e1c82 100644
--- a/mythtv/external/FFmpeg/Makefile
+++ b/mythtv/external/FFmpeg/Makefile
@@ -107,7 +107,7 @@ SVN_ENTRIES = $(SRC_PATH_BARE)/.svn/entries
.version: M=@
version.h .version:
- $(M)$(VERSION_SH) $(SRC_PATH) version.h $(EXTRA_VERSION)
+ $(M)$(VERSION_SH) $(SRC_PATH)/external/FFmpeg version.h $(EXTRA_VERSION)
$(Q)touch .version
# force version.sh to run whenever version might have changed