[FFmpeg-cvslog] Merge commit '650dee63c8b1e6693c6cf5983f4a5ed3f571379f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 20 18:00:42 2014 +0200| [b0fdc76600a17a39b18deb7a1754246a973f3a98] | committer: Michael Niedermayer

Merge commit '650dee63c8b1e6693c6cf5983f4a5ed3f571379f'

* commit '650dee63c8b1e6693c6cf5983f4a5ed3f571379f':
  dv: get rid of global non-const tables

Conflicts:
	libavcodec/dv_profile.h
	libavcodec/dvdec.c
	libavcodec/dvenc.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b0fdc76600a17a39b18deb7a1754246a973f3a98
---