[FFmpeg-cvslog] Merge commit 'a0e1c3517a656dd32293f054a339e0ac73328138'
Michael Niedermayer
git at videolan.org
Thu Jun 26 20:16:11 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun 26 20:10:01 2014 +0200| [932be89c26d71244a5d78378c2c32a826ed6a31e] | committer: Michael Niedermayer
Merge commit 'a0e1c3517a656dd32293f054a339e0ac73328138'
* commit 'a0e1c3517a656dd32293f054a339e0ac73328138':
hevc: remove unused array min_cb_addr_zs
Conflicts:
libavcodec/hevc_ps.c
See: f7f1f4c7ce9ce689823e13a53b694eb14cbbf6e7
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=932be89c26d71244a5d78378c2c32a826ed6a31e
---
More information about the ffmpeg-cvslog
mailing list