Merge pull request #2760 from aballier/ffmpeg_cleanups
authorArne Morten Kvarving <spiff@xbmc.org>
Mon, 10 Jun 2013 10:15:42 +0000 (03:15 -0700)
committerArne Morten Kvarving <spiff@xbmc.org>
Mon, 10 Jun 2013 10:15:42 +0000 (03:15 -0700)
External FFmpeg cleaning

1  2 
configure.in
lib/DllAvUtil.h
xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp

diff --cc configure.in
Simple merge
diff --cc lib/DllAvUtil.h
Simple merge