diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 18:58:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 18:58:59 +0100 |
| commit | 44e4a86c8afca4ac1f7498ff4419364b839a15f9 (patch) | |
| tree | a06e9c5d2a9a9682615c2ad1bdf49ddb765d65f2 /libavcodec/error_resilience.c | |
| parent | 3d1d8e1f95e1cb6682a6dd035046d91a0812d331 (diff) | |
| parent | c377e04d8aa74d030672e9a4788a700b0695fc14 (diff) | |
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>
Diffstat (limited to 'libavcodec/error_resilience.c')
0 files changed, 0 insertions, 0 deletions