Permalink
Browse files

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

  • Loading branch information...
Beirdo committed May 8, 2012
1 parent fd1b335 commit 60c6b410afaa0e11a562794b1a19a34040b42b1b
Showing with 2 additions and 2 deletions.
  1. +1 −1 mythtv/configure
  2. +1 −1 mythtv/external/FFmpeg/Makefile
View
@@ -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"
@@ -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

0 comments on commit 60c6b41

Please sign in to comment.