Merge commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 8 Sep 2015 13:43:03 +0000 (15:43 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 8 Sep 2015 14:35:28 +0000 (16:35 +0200)
commit151aa2ebff514a9d150a2d3a7b92be1dcc46df36
tree866bd99edecd778aee4cd8eb5f34977d0c82a27d
parentf53569a93f853057d4852601b547a1d9c57613b6
parent2268db2cd052674fde55c7d48b7a5098ce89b4ba
Merge commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba'

* commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba':
  lavu: Drop the {minus,plus}1 suffix from AVComponentDescriptor fields

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
18 files changed:
doc/APIchanges
libavcodec/hevc.c
libavcodec/hevc_refs.c
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
libavcodec/libx265.c
libavcodec/pnmenc.c
libavfilter/vf_hqdn3d.c
libavfilter/vf_yadif.c
libavutil/imgutils.c
libavutil/pixdesc.c
libavutil/pixdesc.h
libavutil/version.h
libswscale/output.c
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c
libswscale/utils.c