Michael Niedermayer 47fc82b5b3 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>

2014-04-05 19:43:28 +02:00

26 KiB

Raw Blame History

View Raw