blob: 2cefb12591a5fcafc34c1bc891a3d8c9e2e6e464 (
plain)
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
|
https://bugs.gentoo.org/show_bug.cgi?id=450464
Index: VTK5.10.1/IO/vtkFFMPEGWriter.cxx
===================================================================
--- VTK5.10.1.orig/IO/vtkFFMPEGWriter.cxx
+++ VTK5.10.1/IO/vtkFFMPEGWriter.cxx
@@ -192,13 +192,6 @@ int vtkFFMPEGWriterInternal::Start()
c->bit_rate_tolerance = this->Writer->GetBitRateTolerance();
}
- //apply the chosen parameters
- if (av_set_parameters(this->avFormatContext, NULL) < 0)
- {
- vtkGenericWarningMacro (<< "Invalid output format parameters." );
- return 0;
- }
-
//manufacture a codec with the chosen parameters
AVCodec *codec = avcodec_find_encoder(c->codec_id);
if (!codec)
@@ -259,14 +252,17 @@ int vtkFFMPEGWriterInternal::Start()
//Finally, open the file and start it off.
- if (url_fopen(&this->avFormatContext->pb, this->avFormatContext->filename, URL_WRONLY) < 0)
+ if (avio_open(&this->avFormatContext->pb, this->avFormatContext->filename, AVIO_FLAG_WRITE) < 0)
{
vtkGenericWarningMacro (<< "Could not open " << this->Writer->GetFileName() << "." );
return 0;
}
this->openedFile = 1;
- av_write_header(this->avFormatContext);
+ if(avformat_write_header(this->avFormatContext, NULL) < 0) {
+ vtkGenericWarningMacro (<< "Failed to write header." );
+ return 0;
+ }
return 1;
}
@@ -391,7 +387,7 @@ void vtkFFMPEGWriterInternal::End()
#ifdef VTK_FFMPEG_OLD_URL_FCLOSE
url_fclose(&this->avFormatContext->pb);
#else
- url_fclose(this->avFormatContext->pb);
+ avio_close(this->avFormatContext->pb);
#endif
this->openedFile = 0;
}
|
GitWeb
