Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 27 Apr 2014 13:03:56 +0000 (15:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 27 Apr 2014 13:04:00 +0000 (15:04 +0200)
* cehoyos/master:
  lavf/mpeg.h: Remove an unused definition.

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

Trivial merge