diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-09 11:58:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-09 11:58:13 +0100 |
| commit | 16e65419ed3e654a04091616bd81b8c96c79c268 (patch) | |
| tree | 46e91a52bd14f4eee55c144675c321249d78ef98 /libavformat/4xm.c | |
| parent | 99bf26fc6b17c05e9e1ec598a714c5efe1b978f6 (diff) | |
| parent | f963f80399deb1a2b44c1bac3af7123e8a0c9e46 (diff) | |
| download | ffmpeg-16e65419ed3e654a04091616bd81b8c96c79c268.tar.gz | |
Merge commit 'f963f80399deb1a2b44c1bac3af7123e8a0c9e46'
* commit 'f963f80399deb1a2b44c1bac3af7123e8a0c9e46':
arm: Use .data.rel.ro for const data with relocations
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/4xm.c')
0 files changed, 0 insertions, 0 deletions