[FFmpeg-cvslog] Merge commit 'c377e04d8aa74d030672e9a4788a700b0695fc14'
Michael Niedermayer
git at videolan.org
Sat Mar 21 19:36:05 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 18:58:59 2015 +0100| [44e4a86c8afca4ac1f7498ff4419364b839a15f9] | committer: Michael Niedermayer
Merge commit 'c377e04d8aa74d030672e9a4788a700b0695fc14'
* commit 'c377e04d8aa74d030672e9a4788a700b0695fc14':
h264: move top_borders into the per-slice context
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=44e4a86c8afca4ac1f7498ff4419364b839a15f9
---
More information about the ffmpeg-cvslog
mailing list