diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-24 14:44:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-24 15:47:47 +0100 |
| commit | fc13a89654b5878050ac07e36254c5e712aa8820 (patch) | |
| tree | 73e35d94880aae72b785ef9d1079c442a552777b /CREDITS | |
| parent | 70b0aeba001c61d52965debda4875e610bb2435e (diff) | |
| parent | e9d817351b28e62868528476971afe4cde1fa280 (diff) | |
| download | ffmpeg-fc13a89654b5878050ac07e36254c5e712aa8820.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dsputil: Separate h264 qpel
Conflicts:
libavcodec/dsputil_template.c
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions