RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '25c29d32835f38cdc5f0c84fa27dfc489a228770' 

* commit '25c29d32835f38cdc5f0c84fa27dfc489a228770':
  libopenh264enc: Add support for building with OpenH264 1.4

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-06 11:31:19 +01:00
parent dbd6ba24a8 25c29d3283
commit 39becc949c
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/libopenh264enc.c
View File

@ -39,6 +39,10 @@ typedef struct SVCContext {
char *profile;
} SVCContext;
#define OPENH264_VER_AT_LEAST(maj, min) \
((OPENH264_MAJOR > (maj)) || \
(OPENH264_MAJOR == (maj) && OPENH264_MINOR >= (min)))
#define OFFSET(x) offsetof(SVCContext, x)
#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
static const AVOption options[] = {
@ -103,7 +107,11 @@ static av_cold int svc_encode_init(AVCodecContext *avctx)
param.bEnableLongTermReference = 0;
param.iLtrMarkPeriod = 30;
param.uiIntraPeriod = avctx->gop_size;
#if OPENH264_VER_AT_LEAST(1, 4)
param.eSpsPpsIdStrategy = CONSTANT_ID;
#else
param.bEnableSpsPpsIdAddition = 0;
#endif
param.bPrefixNalAddingCtrl = 0;
param.iLoopFilterDisableIdc = !s->loopfilter;
param.iEntropyCodingModeFlag = 0;