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)
commit5410a5dc660858920d58a5f09daba264f370f81c
tree6d53029cca96abaafad84c01ac3124647dc3b696
parent6fe5f770db3ac2a5fb77d2f3bb4eb977be440bbd
parent7398e0516f7fdf98e74e5ce8966ac02c28aba754
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: c8dd048ab8cff815c9f4b16a62db0b74df011f0a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/hevc.h
libavcodec/hevcdsp.c
libavcodec/hevcdsp.h