Merge commit '5b5338f6d1272526d2634501555cbaff4cdfb87b'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 03:09:47 +0000 (05:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 03:11:48 +0000 (05:11 +0200)
commit1fa7d0902c3eef6fc17f253b5e90c77167483458
treeb35db5c5fed4e40dd2b0e4eaf25b5d693857d70d
parent55b866f618582350bcc5489d4e96afd40c9c8c44
parent5b5338f6d1272526d2634501555cbaff4cdfb87b
Merge commit '5b5338f6d1272526d2634501555cbaff4cdfb87b'

* commit '5b5338f6d1272526d2634501555cbaff4cdfb87b':
  hqx: Implement slice-threaded decoding

Conflicts:
libavcodec/hqx.c
libavcodec/hqx.h

See: eff72a6c7375587a3280ddf59e6e26a4907823b7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/hqx.c
libavcodec/hqx.h