diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 18:52:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 18:52:21 +0100 |
| commit | cd1d4b51e3ed741439557b6943213748ed3f300d (patch) | |
| tree | c4d1c285df94d1848b4f1a2938cf25fd1d1d5a3c /libavcodec/xsubdec.c | |
| parent | 8d024c51071ded5e6d4fa500ee5f3c1ce4886d07 (diff) | |
| parent | 46caba4a65237c006ab54b0c16ecc00d21dedda1 (diff) | |
| download | ffmpeg-cd1d4b51e3ed741439557b6943213748ed3f300d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
float_dsp: Replace arch optimization ifdefs by if cascade
Conflicts:
libavutil/float_dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xsubdec.c')
0 files changed, 0 insertions, 0 deletions