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
Stefy Lanza (nextime / spora )
zum
Commits
8bf18241
Commit
8bf18241
authored
Apr 27, 2013
by
nextime
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ok, this time it will work?
parent
7cb43d0e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
8 deletions
+11
-8
zm_ffmpeg.h
src/zm_ffmpeg.h
+0
-6
zm_sdp.h
src/zm_sdp.h
+11
-2
No files found.
src/zm_ffmpeg.h
View file @
8bf18241
...
...
@@ -53,12 +53,6 @@ extern "C" {
#endif
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(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 @
8bf18241
...
...
@@ -41,7 +41,11 @@ protected:
int
payloadType
;
const
char
payloadName
[
6
];
enum
AVMediaType
codecType
;
enum
ZmCodecID
codecId
;
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,25,0)
enum
AVCodecID
codecId
;
#else
enum
CodecID
codecId
;
#endif
int
clockRate
;
int
autoChannels
;
};
...
...
@@ -50,7 +54,12 @@ protected:
{
const
char
payloadName
[
32
];
enum
AVMediaType
codecType
;
enum
ZmCodecID
codecId
;
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,25,0)
enum
AVCodecID
codecId
;
#else
enum
CodecID
codecId
;
#endif
//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