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>
Showing
Please
register
or
sign in
to comment