diff options
authorGavin Hurlbut <>2011-04-25 06:46:46 (GMT)
committer Gavin Hurlbut <>2011-04-25 06:46:46 (GMT)
commit864e8dbce38ed3811856219634290c7d3226fe7c (patch)
parent62935f769f9beaa65790dbff22e65aba73700bcb (diff)
Make ffmpeg's run in the ffmpeg dir
It seems both our code and ffmpeg's code use, 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.
1 files changed, 1 insertions, 1 deletions
diff --git a/mythtv/external/FFmpeg/Makefile b/mythtv/external/FFmpeg/Makefile
index 515dcf7..e4ae063 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 to run whenever version might have changed