Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
Z
zum
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Franco (nextime) Lanza
zum
Commits
6af58aca
Commit
6af58aca
authored
Apr 26, 2013
by
nextime
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix CodecID changes in recent libav libraries
parent
33cbd892
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
+9
-2
zm_ffmpeg.h
src/zm_ffmpeg.h
+7
-0
zm_sdp.h
src/zm_sdp.h
+2
-2
No files found.
src/zm_ffmpeg.h
View file @
6af58aca
...
...
@@ -52,6 +52,13 @@ extern "C" {
#endif
#endif
#if LIBAVCODEC_BUILD >= CALC_FFMPEG_VERSION(54,25,0)
typedef
AVCodecID
ZmCodecID
;
#else
typedef
CodecID
ZmCodecID
;
#endif
#if FFMPEG_VERSION_INT == 0x000408
#define ZM_FFMPEG_048 1
#elif FFMPEG_VERSION_INT == 0x000409
...
...
src/zm_sdp.h
View file @
6af58aca
...
...
@@ -41,7 +41,7 @@ protected:
int
payloadType
;
const
char
payloadName
[
6
];
enum
AVMediaType
codecType
;
enum
CodecID
codecId
;
enum
Zm
CodecID
codecId
;
int
clockRate
;
int
autoChannels
;
};
...
...
@@ -50,7 +50,7 @@ protected:
{
const
char
payloadName
[
32
];
enum
AVMediaType
codecType
;
enum
CodecID
codecId
;
enum
Zm
CodecID
codecId
;
//int clockRate;
//int autoChannels;
};
...
...
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