* commit '3d1d1753':
  mpeg12enc: set frame packing information when relevant metadata is found

Conflicts:
	libavcodec/mpeg12enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>