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)
commit3d3a7f5034a2ccab0e6ae655c8f9610308773714
tree905bd0fb8ebb36b04b75efb4033bdfefc1cb4cb0
parentf4f8499c19734e1200a9a824734dbc36fba48ce6
parent72072bf9de3241848ea86f68d2297b7a5d6ad49b
Merge remote-tracking branch 'qatar/master'

* 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>