OSDN Git Service

Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Dec 2013 11:43:43 +0000 (12:43 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Dec 2013 11:46:19 +0000 (12:46 +0100)
* qatar/master:
  hevc: move DSP declarations from hevc.h into hevcdsp.h

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

See: c8dd048ab8cff815c9f4b16a62db0b74df011f0a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/hevc.h
libavcodec/hevcdsp.c
libavcodec/hevcdsp.h

Simple merge
Simple merge
Simple merge