summaryrefslogtreecommitdiff
path: root/extra/miro/ffmpeg.patch
diff options
context:
space:
mode:
Diffstat (limited to 'extra/miro/ffmpeg.patch')
-rw-r--r--extra/miro/ffmpeg.patch74
1 files changed, 0 insertions, 74 deletions
diff --git a/extra/miro/ffmpeg.patch b/extra/miro/ffmpeg.patch
deleted file mode 100644
index efbf6f5da..000000000
--- a/extra/miro/ffmpeg.patch
+++ /dev/null
@@ -1,74 +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. */
---- miro-5.0.4/linux/miro-segmenter.c.orig 2012-10-04 20:48:31.000000000 +0200
-+++ miro-5.0.4/linux/miro-segmenter.c 2013-07-14 13:59:53.171303178 +0200
-@@ -228,7 +228,7 @@
- fprintf(stderr, "Could not find video decoder, key frames will not be honored\n");
- }
-
-- if (avcodec_open(video_st->codec, codec) < 0) {
-+ if (avcodec_open2(video_st->codec, codec, NULL) < 0) {
- fprintf(stderr, "Could not open video decoder, key frames will not be honored\n");
- }
- }