Fix ffmplay to depend on SDL, fix version.sh path

MythTV · May 8, 2012 · 60c6b41 · 60c6b41
1 parent fd1b335
commit 60c6b41
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/mythtv/configure b/mythtv/configure
@@ -1913,7 +1913,7 @@ avformat_deps="avcodec"
 postproc_deps="gpl"
 
 # programs
-ffplay_deps="avcodec avformat swscale swresample"
+ffplay_deps="avcodec avformat swscale swresample sdl"
 ffplay_select="buffersink_filter rdft"
 ffprobe_deps="avcodec avformat"
 ffserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer"

diff --git a/mythtv/external/FFmpeg/Makefile b/mythtv/external/FFmpeg/Makefile
@@ -108,7 +108,7 @@ GIT_LOG     = $(SRC_PATH_BARE)/.git/logs/HEAD
 .version: M=@
 
 version.h .version:
-	$(M)$(VERSION_SH) $(SRC_PATH)/external/FFmpeg version.h $(EXTRA_VERSION)
+	$(M)$(VERSION_SH) $(SRC_PATH) version.h $(EXTRA_VERSION)
 	$(Q)touch .version
 
 # force version.sh to run whenever version might have changed