[FFmpeg-cvslog] Merge commit 'f963f80399deb1a2b44c1bac3af7123e8a0c9e46'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Dec  9 11:58:13 2014 +0100| [16e65419ed3e654a04091616bd81b8c96c79c268] | committer: Michael Niedermayer

Merge commit 'f963f80399deb1a2b44c1bac3af7123e8a0c9e46'

* commit 'f963f80399deb1a2b44c1bac3af7123e8a0c9e46':
  arm: Use .data.rel.ro for const data with relocations

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=16e65419ed3e654a04091616bd81b8c96c79c268
---