diff options
| author | Ladislav Hagara | 2013-04-09 15:43:02 +0200 |
|---|---|---|
| committer | Treeve Jelbert | 2013-04-13 10:50:07 +0200 |
| commit | e486e9c27a8032435e8b35bbff820f17e7beaa80 (patch) | |
| tree | 22148a9227f5262a0fbf5ed06a3800f07b03125d | |
| parent | 753721f31d79fc8190edcbc5be01e5eacd432184 (diff) | |
miro 6.0
| -rwxr-xr-x | video/miro/DETAILS | 4 | ||||
| -rw-r--r-- | video/miro/HISTORY | 4 | ||||
| -rwxr-xr-x | video/miro/PRE_BUILD | 4 | ||||
| -rw-r--r-- | video/miro/ffmpeg.patch | 63 |
4 files changed, 6 insertions, 69 deletions
diff --git a/video/miro/DETAILS b/video/miro/DETAILS index e2bf9056cd..4381254e5f 100755 --- a/video/miro/DETAILS +++ b/video/miro/DETAILS @@ -1,9 +1,9 @@ SPELL=miro - VERSION=5.0.2 + VERSION=6.0 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" SOURCE_URL[0]=http://ftp.osuosl.org/pub/pculture.org/miro/src/$SOURCE - SOURCE_HASH=sha512:0f0f1ba8be4ba5131ec63db50e540d7570840a25570588f01ab5c2176d7df46769d5b985f8a719abd680ac7b50d4bd6020da2416c186884fd825c53dd6ddb9fb + SOURCE_HASH=sha512:d7770af3d4c63812c69cdbf05af7d7a2fe017736dc118ad509ce4e5b9ae66f917bf541e8abba5dd2318f22dac1f8698e77fe7da339ebaf7a72181faa77183370 WEB_SITE=http://www.getmiro.com/ ENTERED=20090804 LICENSE[0]=GPL diff --git a/video/miro/HISTORY b/video/miro/HISTORY index 53e8262ebb..0cfbb958f5 100644 --- a/video/miro/HISTORY +++ b/video/miro/HISTORY @@ -1,3 +1,7 @@ +2013-04-09 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 6.0 + * PRE_BUILD, ffmpeg.patch: removed + 2012-08-04 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 5.0.2 * PRE_BUILD, ffmpeg.patch: patch from Arch added diff --git a/video/miro/PRE_BUILD b/video/miro/PRE_BUILD deleted file mode 100755 index 1d3cb75d53..0000000000 --- a/video/miro/PRE_BUILD +++ /dev/null @@ -1,4 +0,0 @@ -default_pre_build && -cd "$SOURCE_DIRECTORY" && - -patch -p1 < "$SPELL_DIRECTORY/ffmpeg.patch" diff --git a/video/miro/ffmpeg.patch b/video/miro/ffmpeg.patch deleted file mode 100644 index 8362308094..0000000000 --- a/video/miro/ffmpeg.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- miro-5.0.1/linux/miro-segmenter.c~ 2012-07-06 14:33:24.618082171 +0000 -+++ miro-5.0.1/linux/miro-segmenter.c 2012-07-06 15:10:19.564146117 +0000 -@@ -156,7 +156,7 @@ - exit(1); - } - -- ret = av_open_input_file(&ic, input, ifmt, 0, NULL); -+ ret = avformat_open_input(&ic, input, ifmt, 0); - if (ret != 0) { - fprintf(stderr, "Could not open input file, make sure it is an mpegts file: %d\n", ret); - exit(1); -@@ -215,12 +215,7 @@ - } - } - -- if (av_set_parameters(oc, NULL) < 0) { -- fprintf(stderr, "Invalid output format parameters\n"); -- 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); -@@ -233,12 +228,12 @@ - } - } - -- if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) { -+ if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) { - fprintf(stderr, "Could not open '%s'\n", output_filename); - exit(1); - } - -- if (av_write_header(oc)) { -+ if (avformat_write_header(oc, NULL)) { - fprintf(stderr, "Could not write mpegts header to first output file\n"); - - exit(1); -@@ -274,10 +269,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, AVIO_FLAG_WRITE) < 0) { - fprintf(stderr, "Could not open '%s'\n", output_filename); - break; - } -@@ -307,7 +302,7 @@ - av_freep(&oc->streams[i]); - } - -- url_fclose(oc->pb); -+ avio_close(oc->pb); - av_free(oc); - - /* End-of-transcode marker. */ |