Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 30 Sep 2013 09:09:21 +0000 (11:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 30 Sep 2013 09:09:32 +0000 (11:09 +0200)
* cehoyos/master:
  Avoid img_segment_size == 0 in mtv demuxer.

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

Trivial merge