1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
--- 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. */
|
