[FFmpeg-cvslog] Merge commit 'da39cac8def7ea73cad2fa2b611209663c7abe2c'
Michael Niedermayer
git at videolan.org
Wed Nov 14 12:31:40 CET 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Nov 14 12:26:55 2012 +0100| [b0c543b1deba77647911be159b013760b5d05db3] | committer: Michael Niedermayer
Merge commit 'da39cac8def7ea73cad2fa2b611209663c7abe2c'
Not merged, its not broken
* commit 'da39cac8def7ea73cad2fa2b611209663c7abe2c':
Drop broken and unused CABAC test program.
Conflicts:
libavcodec/Makefile
libavcodec/cabac.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b0c543b1deba77647911be159b013760b5d05db3
---
More information about the ffmpeg-cvslog
mailing list