Merge commit '453642f8afe9f979fcc813a246b1ec656ec36a93'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 02:57:06 +0000 (04:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 02:57:06 +0000 (04:57 +0200)
commit55b866f618582350bcc5489d4e96afd40c9c8c44
tree9e6705e10fb3104b82e65f421a438f7eec355f9a
parentd8b4e9adbb93211b511e3864d8230789186ef4ed
parent453642f8afe9f979fcc813a246b1ec656ec36a93
Merge commit '453642f8afe9f979fcc813a246b1ec656ec36a93'

* commit '453642f8afe9f979fcc813a246b1ec656ec36a93':
  hqx: Store shareable data in main decoder context

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

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