diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-26 14:33:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-26 14:33:06 +0100 |
| commit | 446d62f0cfea35ad1695f756b5275288498e51e1 (patch) | |
| tree | ca3a8425407f0b2f1fff00e4575f7e82b6ac3708 /libavcodec/cyuv.c | |
| parent | d235d240d8ba88b931cb9ca0aca2cfa586c7eea0 (diff) | |
| parent | 69c25c9284645cf5189af2ede42d6f53828f3b45 (diff) | |
Merge commit '69c25c9284645cf5189af2ede42d6f53828f3b45'
* commit '69c25c9284645cf5189af2ede42d6f53828f3b45':
dnxhdenc: fix invalid reads in dnxhd_mb_var_thread().
x86: h264qpel: Move stray comment to the right spot and clarify it
atrac3: use correct loop variable in add_tonal_components()
Conflicts:
tests/ref/vsynth/vsynth1-dnxhd-1080i
tests/ref/vsynth/vsynth2-dnxhd-1080i
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cyuv.c')
0 files changed, 0 insertions, 0 deletions