diff options
| author | Martin Storsjö <martin@martin.st> | 2016-07-08 23:21:41 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2016-07-27 10:19:46 +0300 |
| commit | 293676c476733e81d7b596736add6cd510eb6960 (patch) | |
| tree | 291111ca865291ac4838d31a8bd7a681ac93ac20 /libavcodec/libopenh264dec.c | |
| parent | c5d326f551b0312ff581bf1df35b21d956e01523 (diff) | |
libopenh264: Support building with the 1.6 release
This fixes trac issue #5417.
This is cherry-picked from libav commit
d825b1a5306576dcd0553b7d0d24a3a46ad92864.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/libopenh264dec.c')
| -rw-r--r-- | libavcodec/libopenh264dec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/libopenh264dec.c b/libavcodec/libopenh264dec.c index f642082182..6af60af434 100644 --- a/libavcodec/libopenh264dec.c +++ b/libavcodec/libopenh264dec.c @@ -90,7 +90,9 @@ static av_cold int svc_decode_init(AVCodecContext *avctx) (*s->decoder)->SetOption(s->decoder, DECODER_OPTION_TRACE_CALLBACK, (void *)&callback_function); (*s->decoder)->SetOption(s->decoder, DECODER_OPTION_TRACE_CALLBACK_CONTEXT, (void *)&avctx); +#if !OPENH264_VER_AT_LEAST(1, 6) param.eOutputColorFormat = videoFormatI420; +#endif param.eEcActiveIdc = ERROR_CON_DISABLE; param.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_DEFAULT; |