Merge commit '63fcedcf01247f15b72c0d1f959bb3b612853ba8'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Dec 2014 20:19:29 +0000 (21:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Dec 2014 20:19:40 +0000 (21:19 +0100)
commit0a3ffcfc8224d38b3fe635d243ff1ec74df17c84
treeb902d6cac46eccfc7bad1a9ba1d1e179254447a1
parentb799ec7e0b346afd6cd8c44d407e3c49d9db6692
parent63fcedcf01247f15b72c0d1f959bb3b612853ba8
Merge commit '63fcedcf01247f15b72c0d1f959bb3b612853ba8'

* commit '63fcedcf01247f15b72c0d1f959bb3b612853ba8':
  mpegvideo: remove unused function declaration

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpegvideo.h