Skip to content

Commit

Permalink
fix win32 build error with all ffmpeg disabled
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@6215 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Apr 28, 2014
1 parent 1f317a1 commit 25aadfc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,7 @@ def glob_recurse(srcdir):
#as long as you install in the same place or tweak the paths.

#ffmpeg is needed for both swscale and x264:
libffmpeg_path = None
libffmpeg_path = ""
if dec_avcodec_ENABLED:
assert not dec_avcodec2_ENABLED, "cannot enable both dec_avcodec and dec_avcodec2"
libffmpeg_path = "C:\\ffmpeg-win32-bin"
Expand Down

0 comments on commit 25aadfc

Please sign in to comment.