* commit 'a42e3a67':
  pcm_dvd: consolidate pieces from pcm.c and mpeg.c

Conflicts:
	libavcodec/pcm.c
	libavcodec/version.h
	libavformat/mpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>