diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 16:14:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 17:13:00 +0100 |
| commit | 5eb1704d5f5a85ff5b532887d559f3cf2822d8fc (patch) | |
| tree | 9282c0edf8e3dd4b4dd014f157044c34dc6527cb /libavcodec/hevc.c | |
| parent | c617c669e9fce59905915c3ba1053f535add6a06 (diff) | |
| parent | 064698d381e1e7790f21b0199a8930ea04e2e942 (diff) | |
Merge commit '064698d381e1e7790f21b0199a8930ea04e2e942'
* commit '064698d381e1e7790f21b0199a8930ea04e2e942':
Add HEVC decoder
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/hevc.c
libavcodec/hevc.h
libavcodec/hevc_cabac.c
libavcodec/hevc_filter.c
libavcodec/hevc_mvs.c
libavcodec/hevc_parser.c
libavcodec/hevc_ps.c
libavcodec/hevc_refs.c
libavcodec/hevc_sei.c
libavcodec/hevcdsp.c
libavcodec/hevcdsp_template.c
libavcodec/hevcpred.c
libavcodec/hevcpred_template.c
libavcodec/version.h
cosmetics from hevc.h & hevc_ps.c mostly merged, other files left as they where in ffmpeg.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc.c')
| -rw-r--r-- | libavcodec/hevc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index 18fee3376c..97fedd513c 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -2882,7 +2882,7 @@ static void hevc_decode_flush(AVCodecContext *avctx) #define OFFSET(x) offsetof(HEVCContext, x) #define PAR (AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_VIDEO_PARAM) static const AVOption options[] = { - { "strict-displaywin", "stricly apply default display window size", OFFSET(strict_def_disp_win), + { "strict-displaywin", "stricly apply default display window size", OFFSET(apply_defdispwin), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, PAR }, { NULL }, }; |