Merge commit '21710ea82118c9d19bea9277b2a85a33096fdd95'

* commit '21710ea82118c9d19bea9277b2a85a33096fdd95':
  dv: Move DV VLC data tables out of header file

Conflicts:
	libavcodec/dv_vlc_data.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/Makefile
Simple merge

diff --cc libavcodec/dv.c
Simple merge

diff --cc libavcodec/dv_tablegen.h
Simple merge

diff --cc libavcodec/dvdata.c
Simple merge

diff --cc libavcodec/dvdata.h
Simple merge