Merge commit '2d7d91f0'

* commit '2d7d91f0':
  svq1enc: Set picture_structure correctly
  mpegvideo: remove last_picture_ptr / h264 assert.
  mpegvideo_enc: remove assert that has become obsolete with the new API
  elbg: Fix an assert

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