[FFmpeg-cvslog] Merge commit '453642f8afe9f979fcc813a246b1ec656ec36a93'
Michael Niedermayer
git at videolan.org
Mon Apr 20 05:04:29 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 20 04:57:06 2015 +0200| [55b866f618582350bcc5489d4e96afd40c9c8c44] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=55b866f618582350bcc5489d4e96afd40c9c8c44
---
More information about the ffmpeg-cvslog
mailing list