Merge commit '064698d381e1e7790f21b0199a8930ea04e2e942'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 15:14:39 +0000 (16:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 16:13:00 +0000 (17:13 +0100)
commit5eb1704d5f5a85ff5b532887d559f3cf2822d8fc
tree9282c0edf8e3dd4b4dd014f157044c34dc6527cb
parentc617c669e9fce59905915c3ba1053f535add6a06
parent064698d381e1e7790f21b0199a8930ea04e2e942
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>
doc/general.texi
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/hevc.c
libavcodec/hevc.h
libavcodec/hevc_cabac.c
libavcodec/hevc_ps.c
libavcodec/utils.c
libavcodec/version.h