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
|
diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp
index 42927f6..61df606 100644
--- a/src/zm_ffmpeg_camera.cpp
+++ b/src/zm_ffmpeg_camera.cpp
@@ -108,7 +108,7 @@ int FfmpegCamera::PrimeCapture()
Info( "Priming capture from %s", mPath.c_str() );
// Open the input, not necessarily a file
- if ( av_open_input_file( &mFormatContext, mPath.c_str(), NULL, 0, NULL ) !=0 )
+ if ( avformat_open_input( &mFormatContext, mPath.c_str(), NULL, NULL ) !=0 )
Fatal( "Unable to open input %s due to: %s", mPath.c_str(), strerror(errno) );
// Locate stream info from input
@@ -139,7 +139,7 @@ int FfmpegCamera::PrimeCapture()
Fatal( "Can't find codec for video stream from %s", mPath.c_str() );
// Open the codec
- if ( avcodec_open( mCodecContext, mCodec ) < 0 )
+ if ( avcodec_open2( mCodecContext, mCodec, NULL ) < 0 )
Fatal( "Unable to open codec for video stream from %s", mPath.c_str() );
// Allocate space for the native video frame
diff --git a/src/zm_mpeg.cpp b/src/zm_mpeg.cpp
index f5de2a4..d614346 100644
--- a/src/zm_mpeg.cpp
+++ b/src/zm_mpeg.cpp
@@ -167,10 +167,12 @@ void VideoStream::SetParameters()
{
/* set the output parameters (must be done even if no
parameters). */
- if ( av_set_parameters(ofc, NULL) < 0 )
+ /*
+ * Removed in last ffmpeg
+ * if ( av_set_parameters(ofc, NULL) < 0 )
{
Panic( "Invalid output format parameters" );
- }
+ }*/
//dump_format(ofc, 0, filename, 1);
}
@@ -259,7 +261,7 @@ void VideoStream::OpenStream()
if ( !(of->flags & AVFMT_NOFILE) )
{
#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,2,1)
- if ( avio_open(&ofc->pb, filename, URL_WRONLY) < 0 )
+ if ( avio_open(&ofc->pb, filename, AVIO_FLAG_WRITE) < 0 )
#else
if ( url_fopen(&ofc->pb, filename, URL_WRONLY) < 0 )
#endif
@@ -278,7 +280,7 @@ void VideoStream::OpenStream()
}
/* write the stream header, if any */
- av_write_header(ofc);
+ avformat_write_header(ofc, NULL);
}
VideoStream::VideoStream( const char *filename, const char *format, int bitrate, double frame_rate, int colours, int subpixelorder, int width, int height )
|
