diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:57:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:57:21 +0100 |
| commit | c9841c05be67908e0980dafe0f7585ba47cbfe28 (patch) | |
| tree | 962eb94bdac044eb1bf6f054d0c1f85f158190ec /libavcodec/arm | |
| parent | a4952e7343f9a77d2995d699ac045b095ab11052 (diff) | |
| parent | a67f8ae9a2c8529bf6a635e8ca4e3483592708b1 (diff) | |
| download | ffmpeg-c9841c05be67908e0980dafe0f7585ba47cbfe28.tar.gz | |
Merge commit 'a67f8ae9a2c8529bf6a635e8ca4e3483592708b1'
* commit 'a67f8ae9a2c8529bf6a635e8ca4e3483592708b1':
h264: move mvd_table into the per-slice context
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm')
0 files changed, 0 insertions, 0 deletions