Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VTK
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alex W.
VTK
Commits
1967fef7
Commit
1967fef7
authored
11 years ago
by
Anton Gladky
Committed by
Dave DeMarle
11 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix compilation against libav 54 and OGG-Theora extension detection
Change-Id: Id74688bcfeefae3c5904e0719d498a185930220e
parent
a70fdae4
Branches
Branches containing commit
Tags
v6.0.0
v6.0.0.rc3
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
IO/FFMPEG/vtkFFMPEGWriter.cxx
+8
-0
8 additions, 0 deletions
IO/FFMPEG/vtkFFMPEGWriter.cxx
with
8 additions
and
0 deletions
IO/FFMPEG/vtkFFMPEGWriter.cxx
+
8
−
0
View file @
1967fef7
...
...
@@ -153,7 +153,11 @@ int vtkFFMPEGWriterInternal::Start()
strcpy
(
this
->
avFormatContext
->
filename
,
this
->
Writer
->
GetFileName
());
//create a stream for that file
#if LIBAVFORMAT_VERSION_MAJOR < 54
this
->
avStream
=
av_new_stream
(
this
->
avFormatContext
,
0
);
#else
this
->
avStream
=
avformat_new_stream
(
this
->
avFormatContext
,
0
);
#endif
if
(
!
this
->
avStream
)
{
vtkGenericWarningMacro
(
<<
"Could not create video stream."
);
...
...
@@ -231,7 +235,11 @@ int vtkFFMPEGWriterInternal::Start()
vtkGenericWarningMacro
(
<<
"Codec not found."
);
return
0
;
}
#if LIBAVFORMAT_VERSION_MAJOR < 54
if
(
avcodec_open
(
c
,
codec
)
<
0
)
#else
if
(
avcodec_is_open
(
c
)
<
0
)
#endif
{
vtkGenericWarningMacro
(
<<
"Could not open codec."
);
return
0
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment