Michael Niedermayer 5410a5dc66 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  hevc: move DSP declarations from hevc.h into hevcdsp.h

Conflicts:
	libavcodec/hevc.h
	libavcodec/hevcdsp.c
	libavcodec/hevcdsp.h

See: c8dd048ab8
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-12-22 12:46:19 +01:00

5.1 KiB

Raw Blame History

View Raw