Merge commit 'c377e04d8aa74d030672e9a4788a700b0695fc14'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 17:58:59 +0000 (18:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 17:58:59 +0000 (18:58 +0100)
commit44e4a86c8afca4ac1f7498ff4419364b839a15f9
treea06e9c5d2a9a9682615c2ad1bdf49ddb765d65f2
parent3d1d8e1f95e1cb6682a6dd035046d91a0812d331
parentc377e04d8aa74d030672e9a4788a700b0695fc14
Merge commit 'c377e04d8aa74d030672e9a4788a700b0695fc14'

* commit 'c377e04d8aa74d030672e9a4788a700b0695fc14':
  h264: move top_borders into the per-slice context

Conflicts:
libavcodec/h264.c

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