Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Oct 2013 11:04:30 +0000 (13:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Oct 2013 11:04:30 +0000 (13:04 +0200)
* qatar/master:
  mpegvideo: Drop a faulty assert

Conflicts:
libavcodec/mpegvideo.c

Merge for metadata only, the change looks wrong.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge