Merge commit '2d7d91f06d6a1d243dc74c96d3389ee237a3b906'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Sep 2012 11:49:48 +0000 (13:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Sep 2012 11:49:48 +0000 (13:49 +0200)
commit743a295c09b129df2ead045415e2ecc46affe523
tree96da3e9153304a823e61f5dc14a11d0e0290b7ce
parentfc15f58adbdc64fa8f22b86180185fed262be3bd
parent2d7d91f06d6a1d243dc74c96d3389ee237a3b906
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@gmx.at>