[FFmpeg-cvslog] Merge commit '2d7d91f06d6a1d243dc74c96d3389ee237a3b906'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep  5 13:49:48 2012 +0200| [743a295c09b129df2ead045415e2ecc46affe523] | committer: Michael Niedermayer

Merge commit '2d7d91f06d6a1d243dc74c96d3389ee237a3b906'

* commit '2d7d91f06d6a1d243dc74c96d3389ee237a3b906':
  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 at gmx.at>

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