summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2012-11-25 17:24:03 +0000
committerLuca Barbato <lu_zero@gentoo.org>2012-11-25 17:24:03 +0000
commita81d29d0f4ca5112d48b697729a353abbe444915 (patch)
treef1c9189ba2ef9dbb5758939ffaf3fb114b78e554 /www-servers/cherokee/files
parentSwitch back code from 0.2.1 and 0.2.2 ebuilds, what a mess did I do... (diff)
downloadgentoo-2-a81d29d0f4ca5112d48b697729a353abbe444915.tar.gz
gentoo-2-a81d29d0f4ca5112d48b697729a353abbe444915.tar.bz2
gentoo-2-a81d29d0f4ca5112d48b697729a353abbe444915.zip
Add libav-9 support
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 1191738E)
Diffstat (limited to 'www-servers/cherokee/files')
-rw-r--r--www-servers/cherokee/files/cherokee-1.2.101-libav-9.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/www-servers/cherokee/files/cherokee-1.2.101-libav-9.patch b/www-servers/cherokee/files/cherokee-1.2.101-libav-9.patch
new file mode 100644
index 000000000000..e7ec110d17c3
--- /dev/null
+++ b/www-servers/cherokee/files/cherokee-1.2.101-libav-9.patch
@@ -0,0 +1,29 @@
+diff -burN cherokee-1.2.101.old//cherokee/handler_streaming.c cherokee-1.2.101/cherokee/handler_streaming.c
+--- cherokee-1.2.101.old//cherokee/handler_streaming.c 2011-10-12 20:07:44.000000000 +0200
++++ cherokee-1.2.101/cherokee/handler_streaming.c 2012-11-25 18:08:05.606331619 +0100
+@@ -312,14 +312,14 @@
+
+ /* Open the media stream
+ */
+- re = av_open_input_file (&hdl->avformat, hdl->local_file.buf, NULL, 0, NULL);
++ re = avformat_open_input (&hdl->avformat, hdl->local_file.buf, NULL, NULL);
+ if (re != 0) {
+ goto error;
+ }
+
+ /* Read the info
+ */
+- re = av_find_stream_info (hdl->avformat);
++ re = avformat_find_stream_info (hdl->avformat, NULL);
+ if (re < 0) {
+ goto error;
+ }
+@@ -380,7 +380,7 @@
+ if (likely (secs > 0)) {
+ long tmp;
+
+- tmp = (hdl->avformat->file_size / secs);
++ tmp = (avio_size(hdl->avformat->pb) / secs);
+ if (tmp > rate) {
+ rate = tmp;
+ TRACE(ENTRIES, "New rate: %d bytes/s\n", rate);