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
|
Index: transcode/import/import_mpeg3.c
===================================================================
--- transcode.orig/import/import_mpeg3.c
+++ transcode/import/import_mpeg3.c
@@ -69,6 +69,9 @@ MOD_open
{
int i;
+#if MPEG3_MINOR > 6
+ int mpeg3_return_value = 0;
+#endif
param->fd = NULL;
@@ -79,14 +82,22 @@ MOD_open
if (param->flag == TC_VIDEO) {
if (!file) {
if (!file_a) {
+#if MPEG3_MINOR < 7
if((file = mpeg3_open(vob->video_in_file))==NULL) {
+#else
+ if(((file = mpeg3_open(vob->video_in_file, &mpeg3_return_value))==NULL) || (mpeg3_return_value != 0)) {
+#endif
fprintf(stderr, "open file failed\n");
return(TC_IMPORT_ERROR);
}
if (verbose & TC_DEBUG)
printf("[%s] Opened video NO copy\n", MOD_NAME);
} else if (file_a) {
+#if MPEG3_MINOR < 7
if((file = mpeg3_open_copy(vob->video_in_file, file_a))==NULL) {
+#else
+ if(((file = mpeg3_open_copy(vob->video_in_file, file_a, &mpeg3_return_value))==NULL) || (mpeg3_return_value != 0)) {
+#endif
fprintf(stderr, "open file failed\n");
return(TC_IMPORT_ERROR);
}
@@ -98,14 +109,22 @@ MOD_open
if (param->flag == TC_AUDIO) {
if (!file_a) {
if (!file) {
+#if MPEG3_MINOR < 7
if((file_a = mpeg3_open(vob->audio_in_file))==NULL) {
+#else
+ if(((file_a = mpeg3_open(vob->audio_in_file, &mpeg3_return_value))==NULL) || (mpeg3_return_value != 0)) {
+#endif
fprintf(stderr, "open audio file failed\n");
return(TC_IMPORT_ERROR);
}
if (verbose & TC_DEBUG)
printf("[%s] Opened audio NO copy\n", MOD_NAME);
} else if (file) {
+#if MPEG3_MINOR < 7
if((file_a = mpeg3_open_copy(vob->audio_in_file, file))==NULL) {
+#else
+ if(((file_a = mpeg3_open_copy(vob->audio_in_file, file, &mpeg3_return_value))==NULL) || (mpeg3_return_value != 0)) {
+#endif
fprintf(stderr, "open_copy audio file failed\n");
return(TC_IMPORT_ERROR);
}
|
GitWeb
