diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-07 20:29:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-07 20:29:43 +0200 |
| commit | 3245c8b669018c43ad4bc18cb1720cb757526b85 (patch) | |
| tree | a0d97815a1c6911452e3660fc494364a7146afa7 /libswresample | |
| parent | e14052dbc8b2f6f0aef99326985e5331cfc98e08 (diff) | |
| parent | fdaad6354fbf1925c9bfeadd32950c503c1103ad (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mxfdec: replace x>>av_log2(sizeof(..)) by x/sizeof(..).
x86: h264_intrapred: Don't add the 'd' suffix to the SPLATB_REG macro
Conflicts:
libavformat/mxfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
0 files changed, 0 insertions, 0 deletions