diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-05 19:43:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-05 19:43:28 +0200 |
| commit | 47fc82b5b34677f49bb263ee9e67350cb004fe31 (patch) | |
| tree | 082f3f5e1a65159244427d1362f3caea9092af7c /libavcodec/xvmc.h | |
| parent | e6f69b324e88794c7a2874e5ee8398b3ac41b10c (diff) | |
| parent | 5f9220437025a0d66abc68323b4ce9b50e72d51b (diff) | |
| download | ffmpeg-47fc82b5b34677f49bb263ee9e67350cb004fe31.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dsputil: Move DV-specific ff_zigzag248_direct table to dvdata
Conflicts:
libavcodec/dv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xvmc.h')
0 files changed, 0 insertions, 0 deletions