[arch-commits] Commit in miro/repos (12 files)
Ronald van Haren
ronald at archlinux.org
Tue Jan 31 20:05:46 UTC 2012
Date: Tuesday, January 31, 2012 @ 15:05:46
Author: ronald
Revision: 148432
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
miro/repos/extra-i686/PKGBUILD
(from rev 148431, miro/trunk/PKGBUILD)
miro/repos/extra-i686/ffmpeg.patch
(from rev 148431, miro/trunk/ffmpeg.patch)
miro/repos/extra-i686/miro.install
(from rev 148431, miro/trunk/miro.install)
miro/repos/extra-x86_64/PKGBUILD
(from rev 148431, miro/trunk/PKGBUILD)
miro/repos/extra-x86_64/ffmpeg.patch
(from rev 148431, miro/trunk/ffmpeg.patch)
miro/repos/extra-x86_64/miro.install
(from rev 148431, miro/trunk/miro.install)
Deleted:
miro/repos/extra-i686/PKGBUILD
miro/repos/extra-i686/ffmpeg.patch
miro/repos/extra-i686/miro.install
miro/repos/extra-x86_64/PKGBUILD
miro/repos/extra-x86_64/ffmpeg.patch
miro/repos/extra-x86_64/miro.install
---------------------------+
extra-i686/PKGBUILD | 64 +++++++-------
extra-i686/ffmpeg.patch | 190 ++++++++++++++++++++++----------------------
extra-i686/miro.install | 34 +++----
extra-x86_64/PKGBUILD | 64 +++++++-------
extra-x86_64/ffmpeg.patch | 190 ++++++++++++++++++++++----------------------
extra-x86_64/miro.install | 34 +++----
6 files changed, 288 insertions(+), 288 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-01-31 20:05:03 UTC (rev 148431)
+++ extra-i686/PKGBUILD 2012-01-31 20:05:46 UTC (rev 148432)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-
-pkgname=miro
-pkgver=4.0.5
-pkgrel=1
-pkgdesc="The free and open source internet TV platform"
-arch=('i686' 'x86_64')
-url="http://www.getmiro.com"
-license=('GPL2')
-depends=('dbus-python' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf'
- 'python-pysqlite' 'pywebkitgtk' 'shared-mime-info'
- 'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme'
- 'gstreamer0.10-python' 'python-notify' 'libtorrent-rasterbar'
- 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python-pycurl'
- 'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen')
-makedepends=('pkg-config')
-install=miro.install
-options=('!makeflags')
-source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('1921357026df1092284a572ffe9c75ae32ec313f')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- cd linux
-
- python2 setup.py install --root="${pkgdir}"
-
- # fix miro startup script so --debug works with python2
- sed -i "s|which python|which python2|" "${pkgdir}/usr/bin/miro"
- sed -i "s|./miro.real|/usr/bin/miro.real|" "${pkgdir}/usr/bin/miro"
-}
Copied: miro/repos/extra-i686/PKGBUILD (from rev 148431, miro/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-01-31 20:05:46 UTC (rev 148432)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+
+pkgname=miro
+pkgver=4.0.6
+pkgrel=1
+pkgdesc="The free and open source internet TV platform"
+arch=('i686' 'x86_64')
+url="http://www.getmiro.com"
+license=('GPL2')
+depends=('dbus-python' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf'
+ 'python-pysqlite' 'pywebkitgtk' 'shared-mime-info'
+ 'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme'
+ 'gstreamer0.10-python' 'python-notify' 'libtorrent-rasterbar'
+ 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python-pycurl'
+ 'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen')
+makedepends=('pkg-config')
+install=miro.install
+options=('!makeflags')
+source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('5c3d632d8cf30516b321f79b22d4468b61ff9e6c')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ cd linux
+
+ python2 setup.py install --root="${pkgdir}"
+
+ # fix miro startup script so --debug works with python2
+ sed -i "s|which python|which python2|" "${pkgdir}/usr/bin/miro"
+ sed -i "s|./miro.real|/usr/bin/miro.real|" "${pkgdir}/usr/bin/miro"
+}
Deleted: extra-i686/ffmpeg.patch
===================================================================
--- extra-i686/ffmpeg.patch 2012-01-31 20:05:03 UTC (rev 148431)
+++ extra-i686/ffmpeg.patch 2012-01-31 20:05:46 UTC (rev 148432)
@@ -1,95 +0,0 @@
-diff -urN miro-4.0.old/linux/miro-segmenter.c miro-4.0/linux/miro-segmenter.c
---- miro-4.0.old/linux/miro-segmenter.c 2011-05-25 15:58:21.000000000 +0200
-+++ miro-4.0/linux/miro-segmenter.c 2011-05-25 16:09:41.000000000 +0200
-@@ -60,7 +60,7 @@
- }
-
- switch (input_codec_context->codec_type) {
-- case CODEC_TYPE_AUDIO:
-+ case AVMEDIA_TYPE_AUDIO:
- output_codec_context->channel_layout = input_codec_context->channel_layout;
- output_codec_context->sample_rate = input_codec_context->sample_rate;
- output_codec_context->channels = input_codec_context->channels;
-@@ -72,7 +72,7 @@
- output_codec_context->block_align = input_codec_context->block_align;
- }
- break;
-- case CODEC_TYPE_VIDEO:
-+ case AVMEDIA_TYPE_VIDEO:
- output_codec_context->pix_fmt = input_codec_context->pix_fmt;
- output_codec_context->width = input_codec_context->width;
- output_codec_context->height = input_codec_context->height;
-@@ -154,7 +154,7 @@
- exit(1);
- }
-
-- ofmt = guess_format("mpegts", NULL, NULL);
-+ ofmt = av_guess_format("mpegts", NULL, NULL);
- if (!ofmt) {
- fprintf(stderr, "Could not find MPEG-TS muxer\n");
- exit(1);
-@@ -174,12 +174,12 @@
-
- for (i = 0; i < ic->nb_streams && (video_index < 0 || audio_index < 0); i++) {
- switch (ic->streams[i]->codec->codec_type) {
-- case CODEC_TYPE_VIDEO:
-+ case AVMEDIA_TYPE_VIDEO:
- video_index = i;
- ic->streams[i]->discard = AVDISCARD_NONE;
- video_st = add_output_stream(oc, ic->streams[i]);
- break;
-- case CODEC_TYPE_AUDIO:
-+ case AVMEDIA_TYPE_AUDIO:
- audio_index = i;
- ic->streams[i]->discard = AVDISCARD_NONE;
- audio_st = add_output_stream(oc, ic->streams[i]);
-@@ -195,7 +195,7 @@
- exit(1);
- }
-
-- dump_format(oc, 0, input, 1);
-+ av_dump_format(oc, 0, input, 1);
-
- if (video_st) {
- codec = avcodec_find_decoder(video_st->codec->codec_id);
-@@ -208,7 +208,7 @@
- }
- }
-
-- if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
-+ if (avio_open(&oc->pb, output_filename, URL_WRONLY) < 0) {
- fprintf(stderr, "Could not open '%s'\n", output_filename);
- exit(1);
- }
-@@ -234,7 +234,7 @@
- break;
- }
-
-- if (packet.stream_index == video_index && (packet.flags & PKT_FLAG_KEY)) {
-+ if (packet.stream_index == video_index && (packet.flags & AV_PKT_FLAG_KEY)) {
- segment_time = (double)video_st->pts.val * video_st->time_base.num / video_st->time_base.den;
- }
- else if (video_index < 0) {
-@@ -245,10 +245,10 @@
- }
-
- if (segment_time - prev_segment_time >= segment_duration) {
-- put_flush_packet(oc->pb);
-- url_fclose(oc->pb);
-+ avio_flush(oc->pb);
-+ avio_close(oc->pb);
-
-- if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
-+ if (avio_open(&oc->pb, output_filename, URL_WRONLY) < 0) {
- fprintf(stderr, "Could not open '%s'\n", output_filename);
- break;
- }
-@@ -278,7 +278,7 @@
- av_freep(&oc->streams[i]);
- }
-
-- url_fclose(oc->pb);
-+ avio_close(oc->pb);
- av_free(oc);
-
- return 0;
Copied: miro/repos/extra-i686/ffmpeg.patch (from rev 148431, miro/trunk/ffmpeg.patch)
===================================================================
--- extra-i686/ffmpeg.patch (rev 0)
+++ extra-i686/ffmpeg.patch 2012-01-31 20:05:46 UTC (rev 148432)
@@ -0,0 +1,95 @@
+diff -urN miro-4.0.old/linux/miro-segmenter.c miro-4.0/linux/miro-segmenter.c
+--- miro-4.0.old/linux/miro-segmenter.c 2011-05-25 15:58:21.000000000 +0200
++++ miro-4.0/linux/miro-segmenter.c 2011-05-25 16:09:41.000000000 +0200
+@@ -60,7 +60,7 @@
+ }
+
+ switch (input_codec_context->codec_type) {
+- case CODEC_TYPE_AUDIO:
++ case AVMEDIA_TYPE_AUDIO:
+ output_codec_context->channel_layout = input_codec_context->channel_layout;
+ output_codec_context->sample_rate = input_codec_context->sample_rate;
+ output_codec_context->channels = input_codec_context->channels;
+@@ -72,7 +72,7 @@
+ output_codec_context->block_align = input_codec_context->block_align;
+ }
+ break;
+- case CODEC_TYPE_VIDEO:
++ case AVMEDIA_TYPE_VIDEO:
+ output_codec_context->pix_fmt = input_codec_context->pix_fmt;
+ output_codec_context->width = input_codec_context->width;
+ output_codec_context->height = input_codec_context->height;
+@@ -154,7 +154,7 @@
+ exit(1);
+ }
+
+- ofmt = guess_format("mpegts", NULL, NULL);
++ ofmt = av_guess_format("mpegts", NULL, NULL);
+ if (!ofmt) {
+ fprintf(stderr, "Could not find MPEG-TS muxer\n");
+ exit(1);
+@@ -174,12 +174,12 @@
+
+ for (i = 0; i < ic->nb_streams && (video_index < 0 || audio_index < 0); i++) {
+ switch (ic->streams[i]->codec->codec_type) {
+- case CODEC_TYPE_VIDEO:
++ case AVMEDIA_TYPE_VIDEO:
+ video_index = i;
+ ic->streams[i]->discard = AVDISCARD_NONE;
+ video_st = add_output_stream(oc, ic->streams[i]);
+ break;
+- case CODEC_TYPE_AUDIO:
++ case AVMEDIA_TYPE_AUDIO:
+ audio_index = i;
+ ic->streams[i]->discard = AVDISCARD_NONE;
+ audio_st = add_output_stream(oc, ic->streams[i]);
+@@ -195,7 +195,7 @@
+ exit(1);
+ }
+
+- dump_format(oc, 0, input, 1);
++ av_dump_format(oc, 0, input, 1);
+
+ if (video_st) {
+ codec = avcodec_find_decoder(video_st->codec->codec_id);
+@@ -208,7 +208,7 @@
+ }
+ }
+
+- if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
++ if (avio_open(&oc->pb, output_filename, URL_WRONLY) < 0) {
+ fprintf(stderr, "Could not open '%s'\n", output_filename);
+ exit(1);
+ }
+@@ -234,7 +234,7 @@
+ break;
+ }
+
+- if (packet.stream_index == video_index && (packet.flags & PKT_FLAG_KEY)) {
++ if (packet.stream_index == video_index && (packet.flags & AV_PKT_FLAG_KEY)) {
+ segment_time = (double)video_st->pts.val * video_st->time_base.num / video_st->time_base.den;
+ }
+ else if (video_index < 0) {
+@@ -245,10 +245,10 @@
+ }
+
+ if (segment_time - prev_segment_time >= segment_duration) {
+- put_flush_packet(oc->pb);
+- url_fclose(oc->pb);
++ avio_flush(oc->pb);
++ avio_close(oc->pb);
+
+- if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
++ if (avio_open(&oc->pb, output_filename, URL_WRONLY) < 0) {
+ fprintf(stderr, "Could not open '%s'\n", output_filename);
+ break;
+ }
+@@ -278,7 +278,7 @@
+ av_freep(&oc->streams[i]);
+ }
+
+- url_fclose(oc->pb);
++ avio_close(oc->pb);
+ av_free(oc);
+
+ return 0;
Deleted: extra-i686/miro.install
===================================================================
--- extra-i686/miro.install 2012-01-31 20:05:03 UTC (rev 148431)
+++ extra-i686/miro.install 2012-01-31 20:05:46 UTC (rev 148432)
@@ -1,17 +0,0 @@
-post_install() {
- update-desktop-database -q
- xdg-icon-resource forceupdate --theme hicolor
- update-mime-database usr/share/mime > /dev/null
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- update-desktop-database -q
- xdg-icon-resource forceupdate --theme hicolor
- update-mime-database usr/share/mime > /dev/null
-}
-
-
Copied: miro/repos/extra-i686/miro.install (from rev 148431, miro/trunk/miro.install)
===================================================================
--- extra-i686/miro.install (rev 0)
+++ extra-i686/miro.install 2012-01-31 20:05:46 UTC (rev 148432)
@@ -0,0 +1,17 @@
+post_install() {
+ update-desktop-database -q
+ xdg-icon-resource forceupdate --theme hicolor
+ update-mime-database usr/share/mime > /dev/null
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ update-desktop-database -q
+ xdg-icon-resource forceupdate --theme hicolor
+ update-mime-database usr/share/mime > /dev/null
+}
+
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-01-31 20:05:03 UTC (rev 148431)
+++ extra-x86_64/PKGBUILD 2012-01-31 20:05:46 UTC (rev 148432)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-
-pkgname=miro
-pkgver=4.0.5
-pkgrel=1
-pkgdesc="The free and open source internet TV platform"
-arch=('i686' 'x86_64')
-url="http://www.getmiro.com"
-license=('GPL2')
-depends=('dbus-python' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf'
- 'python-pysqlite' 'pywebkitgtk' 'shared-mime-info'
- 'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme'
- 'gstreamer0.10-python' 'python-notify' 'libtorrent-rasterbar'
- 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python-pycurl'
- 'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen')
-makedepends=('pkg-config')
-install=miro.install
-options=('!makeflags')
-source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('1921357026df1092284a572ffe9c75ae32ec313f')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- cd linux
-
- python2 setup.py install --root="${pkgdir}"
-
- # fix miro startup script so --debug works with python2
- sed -i "s|which python|which python2|" "${pkgdir}/usr/bin/miro"
- sed -i "s|./miro.real|/usr/bin/miro.real|" "${pkgdir}/usr/bin/miro"
-}
Copied: miro/repos/extra-x86_64/PKGBUILD (from rev 148431, miro/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-01-31 20:05:46 UTC (rev 148432)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+
+pkgname=miro
+pkgver=4.0.6
+pkgrel=1
+pkgdesc="The free and open source internet TV platform"
+arch=('i686' 'x86_64')
+url="http://www.getmiro.com"
+license=('GPL2')
+depends=('dbus-python' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf'
+ 'python-pysqlite' 'pywebkitgtk' 'shared-mime-info'
+ 'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme'
+ 'gstreamer0.10-python' 'python-notify' 'libtorrent-rasterbar'
+ 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python-pycurl'
+ 'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen')
+makedepends=('pkg-config')
+install=miro.install
+options=('!makeflags')
+source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('5c3d632d8cf30516b321f79b22d4468b61ff9e6c')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ cd linux
+
+ python2 setup.py install --root="${pkgdir}"
+
+ # fix miro startup script so --debug works with python2
+ sed -i "s|which python|which python2|" "${pkgdir}/usr/bin/miro"
+ sed -i "s|./miro.real|/usr/bin/miro.real|" "${pkgdir}/usr/bin/miro"
+}
Deleted: extra-x86_64/ffmpeg.patch
===================================================================
--- extra-x86_64/ffmpeg.patch 2012-01-31 20:05:03 UTC (rev 148431)
+++ extra-x86_64/ffmpeg.patch 2012-01-31 20:05:46 UTC (rev 148432)
@@ -1,95 +0,0 @@
-diff -urN miro-4.0.old/linux/miro-segmenter.c miro-4.0/linux/miro-segmenter.c
---- miro-4.0.old/linux/miro-segmenter.c 2011-05-25 15:58:21.000000000 +0200
-+++ miro-4.0/linux/miro-segmenter.c 2011-05-25 16:09:41.000000000 +0200
-@@ -60,7 +60,7 @@
- }
-
- switch (input_codec_context->codec_type) {
-- case CODEC_TYPE_AUDIO:
-+ case AVMEDIA_TYPE_AUDIO:
- output_codec_context->channel_layout = input_codec_context->channel_layout;
- output_codec_context->sample_rate = input_codec_context->sample_rate;
- output_codec_context->channels = input_codec_context->channels;
-@@ -72,7 +72,7 @@
- output_codec_context->block_align = input_codec_context->block_align;
- }
- break;
-- case CODEC_TYPE_VIDEO:
-+ case AVMEDIA_TYPE_VIDEO:
- output_codec_context->pix_fmt = input_codec_context->pix_fmt;
- output_codec_context->width = input_codec_context->width;
- output_codec_context->height = input_codec_context->height;
-@@ -154,7 +154,7 @@
- exit(1);
- }
-
-- ofmt = guess_format("mpegts", NULL, NULL);
-+ ofmt = av_guess_format("mpegts", NULL, NULL);
- if (!ofmt) {
- fprintf(stderr, "Could not find MPEG-TS muxer\n");
- exit(1);
-@@ -174,12 +174,12 @@
-
- for (i = 0; i < ic->nb_streams && (video_index < 0 || audio_index < 0); i++) {
- switch (ic->streams[i]->codec->codec_type) {
-- case CODEC_TYPE_VIDEO:
-+ case AVMEDIA_TYPE_VIDEO:
- video_index = i;
- ic->streams[i]->discard = AVDISCARD_NONE;
- video_st = add_output_stream(oc, ic->streams[i]);
- break;
-- case CODEC_TYPE_AUDIO:
-+ case AVMEDIA_TYPE_AUDIO:
- audio_index = i;
- ic->streams[i]->discard = AVDISCARD_NONE;
- audio_st = add_output_stream(oc, ic->streams[i]);
-@@ -195,7 +195,7 @@
- exit(1);
- }
-
-- dump_format(oc, 0, input, 1);
-+ av_dump_format(oc, 0, input, 1);
-
- if (video_st) {
- codec = avcodec_find_decoder(video_st->codec->codec_id);
-@@ -208,7 +208,7 @@
- }
- }
-
-- if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
-+ if (avio_open(&oc->pb, output_filename, URL_WRONLY) < 0) {
- fprintf(stderr, "Could not open '%s'\n", output_filename);
- exit(1);
- }
-@@ -234,7 +234,7 @@
- break;
- }
-
-- if (packet.stream_index == video_index && (packet.flags & PKT_FLAG_KEY)) {
-+ if (packet.stream_index == video_index && (packet.flags & AV_PKT_FLAG_KEY)) {
- segment_time = (double)video_st->pts.val * video_st->time_base.num / video_st->time_base.den;
- }
- else if (video_index < 0) {
-@@ -245,10 +245,10 @@
- }
-
- if (segment_time - prev_segment_time >= segment_duration) {
-- put_flush_packet(oc->pb);
-- url_fclose(oc->pb);
-+ avio_flush(oc->pb);
-+ avio_close(oc->pb);
-
-- if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
-+ if (avio_open(&oc->pb, output_filename, URL_WRONLY) < 0) {
- fprintf(stderr, "Could not open '%s'\n", output_filename);
- break;
- }
-@@ -278,7 +278,7 @@
- av_freep(&oc->streams[i]);
- }
-
-- url_fclose(oc->pb);
-+ avio_close(oc->pb);
- av_free(oc);
-
- return 0;
Copied: miro/repos/extra-x86_64/ffmpeg.patch (from rev 148431, miro/trunk/ffmpeg.patch)
===================================================================
--- extra-x86_64/ffmpeg.patch (rev 0)
+++ extra-x86_64/ffmpeg.patch 2012-01-31 20:05:46 UTC (rev 148432)
@@ -0,0 +1,95 @@
+diff -urN miro-4.0.old/linux/miro-segmenter.c miro-4.0/linux/miro-segmenter.c
+--- miro-4.0.old/linux/miro-segmenter.c 2011-05-25 15:58:21.000000000 +0200
++++ miro-4.0/linux/miro-segmenter.c 2011-05-25 16:09:41.000000000 +0200
+@@ -60,7 +60,7 @@
+ }
+
+ switch (input_codec_context->codec_type) {
+- case CODEC_TYPE_AUDIO:
++ case AVMEDIA_TYPE_AUDIO:
+ output_codec_context->channel_layout = input_codec_context->channel_layout;
+ output_codec_context->sample_rate = input_codec_context->sample_rate;
+ output_codec_context->channels = input_codec_context->channels;
+@@ -72,7 +72,7 @@
+ output_codec_context->block_align = input_codec_context->block_align;
+ }
+ break;
+- case CODEC_TYPE_VIDEO:
++ case AVMEDIA_TYPE_VIDEO:
+ output_codec_context->pix_fmt = input_codec_context->pix_fmt;
+ output_codec_context->width = input_codec_context->width;
+ output_codec_context->height = input_codec_context->height;
+@@ -154,7 +154,7 @@
+ exit(1);
+ }
+
+- ofmt = guess_format("mpegts", NULL, NULL);
++ ofmt = av_guess_format("mpegts", NULL, NULL);
+ if (!ofmt) {
+ fprintf(stderr, "Could not find MPEG-TS muxer\n");
+ exit(1);
+@@ -174,12 +174,12 @@
+
+ for (i = 0; i < ic->nb_streams && (video_index < 0 || audio_index < 0); i++) {
+ switch (ic->streams[i]->codec->codec_type) {
+- case CODEC_TYPE_VIDEO:
++ case AVMEDIA_TYPE_VIDEO:
+ video_index = i;
+ ic->streams[i]->discard = AVDISCARD_NONE;
+ video_st = add_output_stream(oc, ic->streams[i]);
+ break;
+- case CODEC_TYPE_AUDIO:
++ case AVMEDIA_TYPE_AUDIO:
+ audio_index = i;
+ ic->streams[i]->discard = AVDISCARD_NONE;
+ audio_st = add_output_stream(oc, ic->streams[i]);
+@@ -195,7 +195,7 @@
+ exit(1);
+ }
+
+- dump_format(oc, 0, input, 1);
++ av_dump_format(oc, 0, input, 1);
+
+ if (video_st) {
+ codec = avcodec_find_decoder(video_st->codec->codec_id);
+@@ -208,7 +208,7 @@
+ }
+ }
+
+- if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
++ if (avio_open(&oc->pb, output_filename, URL_WRONLY) < 0) {
+ fprintf(stderr, "Could not open '%s'\n", output_filename);
+ exit(1);
+ }
+@@ -234,7 +234,7 @@
+ break;
+ }
+
+- if (packet.stream_index == video_index && (packet.flags & PKT_FLAG_KEY)) {
++ if (packet.stream_index == video_index && (packet.flags & AV_PKT_FLAG_KEY)) {
+ segment_time = (double)video_st->pts.val * video_st->time_base.num / video_st->time_base.den;
+ }
+ else if (video_index < 0) {
+@@ -245,10 +245,10 @@
+ }
+
+ if (segment_time - prev_segment_time >= segment_duration) {
+- put_flush_packet(oc->pb);
+- url_fclose(oc->pb);
++ avio_flush(oc->pb);
++ avio_close(oc->pb);
+
+- if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
++ if (avio_open(&oc->pb, output_filename, URL_WRONLY) < 0) {
+ fprintf(stderr, "Could not open '%s'\n", output_filename);
+ break;
+ }
+@@ -278,7 +278,7 @@
+ av_freep(&oc->streams[i]);
+ }
+
+- url_fclose(oc->pb);
++ avio_close(oc->pb);
+ av_free(oc);
+
+ return 0;
Deleted: extra-x86_64/miro.install
===================================================================
--- extra-x86_64/miro.install 2012-01-31 20:05:03 UTC (rev 148431)
+++ extra-x86_64/miro.install 2012-01-31 20:05:46 UTC (rev 148432)
@@ -1,17 +0,0 @@
-post_install() {
- update-desktop-database -q
- xdg-icon-resource forceupdate --theme hicolor
- update-mime-database usr/share/mime > /dev/null
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- update-desktop-database -q
- xdg-icon-resource forceupdate --theme hicolor
- update-mime-database usr/share/mime > /dev/null
-}
-
-
Copied: miro/repos/extra-x86_64/miro.install (from rev 148431, miro/trunk/miro.install)
===================================================================
--- extra-x86_64/miro.install (rev 0)
+++ extra-x86_64/miro.install 2012-01-31 20:05:46 UTC (rev 148432)
@@ -0,0 +1,17 @@
+post_install() {
+ update-desktop-database -q
+ xdg-icon-resource forceupdate --theme hicolor
+ update-mime-database usr/share/mime > /dev/null
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ update-desktop-database -q
+ xdg-icon-resource forceupdate --theme hicolor
+ update-mime-database usr/share/mime > /dev/null
+}
+
+
More information about the arch-commits
mailing list