aboutsummaryrefslogtreecommitdiff
path: root/lib/ffmpeg/README
diff options
context:
space:
mode:
authortheuni <theuni-nospam-@xbmc.org>2011-01-24 16:05:21 -0500
committertheuni <theuni-nospam-@xbmc.org>2011-01-24 16:05:21 -0500
commitc51b1189e3d5353e842991f5859ddcea0f73e426 (patch)
treeef2cb8a6184699aa614f3655dca4ce661cdc108e /lib/ffmpeg/README
parentbe61ebdc9e897fe40c6f371111724de79ddee8d5 (diff)
Merged cptspiff's code-reshuffle branch.
Squashed commit due to build breakage during code-reshuffle history. Conflicts: xbmc/Util.cpp xbmc/cdrip/CDDARipper.cpp xbmc/filesystem/Directory.cpp xbmc/filesystem/File.cpp
Diffstat (limited to 'lib/ffmpeg/README')
-rw-r--r--lib/ffmpeg/README12
1 files changed, 12 insertions, 0 deletions
diff --git a/lib/ffmpeg/README b/lib/ffmpeg/README
new file mode 100644
index 0000000000..e907e90223
--- /dev/null
+++ b/lib/ffmpeg/README
@@ -0,0 +1,12 @@
+FFmpeg README
+-------------
+
+1) Documentation
+----------------
+
+* Read the documentation in the doc/ directory.
+
+2) Licensing
+------------
+
+* See the LICENSE file.