Merge pull request #4595 from FernetMenta/ffmpeg2
authorRainer Hochecker <fernetmenta@online.de>
Tue, 29 Apr 2014 07:42:38 +0000 (09:42 +0200)
committerRainer Hochecker <fernetmenta@online.de>
Tue, 29 Apr 2014 07:42:38 +0000 (09:42 +0200)
FFmpeg upgrade to 2.2 , remove from tree

1  2 
xbmc/Application.cpp

Simple merge