Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
325e0b1a
Commit
325e0b1a
authored
Nov 04, 2011
by
Vadim Pisarevsky
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed ffmpeg backend build on Ubuntu 11.10
parent
3396a2ec
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
cap_ffmpeg_impl.hpp
modules/highgui/src/cap_ffmpeg_impl.hpp
+5
-5
No files found.
modules/highgui/src/cap_ffmpeg_impl.hpp
View file @
325e0b1a
...
...
@@ -540,7 +540,7 @@ bool CvCapture_FFMPEG::open( const char* _filename )
avcodec_thread_init
(
enc
,
get_number_of_cpus
());
#if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(53,
4
, 0)
#if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(53,
2
, 0)
#define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO
#endif
...
...
@@ -631,7 +631,7 @@ bool CvCapture_FFMPEG::grabFrame()
continue
;
}
#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53,
4
, 0)
#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53,
2
, 0)
avcodec_decode_video2
(
video_st
->
codec
,
picture
,
&
got_picture
,
&
packet
);
#else
#if LIBAVFORMAT_BUILD > 4628
...
...
@@ -881,7 +881,7 @@ struct CvVideoWriter_FFMPEG
static
const
char
*
icvFFMPEGErrStr
(
int
err
)
{
#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53,
4
, 0)
#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53,
2
, 0)
switch
(
err
)
{
case
AVERROR_BSF_NOT_FOUND
:
return
"Bitstream filter not found"
;
...
...
@@ -1333,7 +1333,7 @@ bool CvVideoWriter_FFMPEG::open( const char * filename, int fourcc,
/* auto detect the output format from the name and fourcc code. */
#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53,
4
, 0)
#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53,
2
, 0)
fmt
=
av_guess_format
(
NULL
,
filename
,
NULL
);
#else
fmt
=
guess_format
(
NULL
,
filename
,
NULL
);
...
...
@@ -1361,7 +1361,7 @@ bool CvVideoWriter_FFMPEG::open( const char * filename, int fourcc,
#endif
// alloc memory for context
#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53,
4
, 0)
#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53,
2
, 0)
oc
=
avformat_alloc_context
();
#else
oc
=
av_alloc_format_context
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment