Merge commit '5a1a9da8a7ae120f2543b8f2fa13dc8baac39f17'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 7 Sep 2015 14:08:42 +0000 (16:08 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 7 Sep 2015 14:08:42 +0000 (16:08 +0200)
* commit '5a1a9da8a7ae120f2543b8f2fa13dc8baac39f17':
  mpegvideo: Drop a stray error message

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavcodec/mpegvideo.c

Simple merge