Merge commit '525f58977c93e189fda49a5c4928feaf4d89fac6'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 16 Sep 2015 09:23:20 +0000 (11:23 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 16 Sep 2015 09:23:20 +0000 (11:23 +0200)
commitb3ff8ef6ec239085f41ee3b0b68d7ac0a4142226
treeaf1213f437b4037bc5df38e73c7ae35e4192713d
parent643a1560024f52ba56b56e812820765b3ae03be6
parent525f58977c93e189fda49a5c4928feaf4d89fac6
Merge commit '525f58977c93e189fda49a5c4928feaf4d89fac6'

* commit '525f58977c93e189fda49a5c4928feaf4d89fac6':
  mpegvideo: Move macros to more appropriate headers

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/motion_est.h
libavcodec/mpegutils.h
libavcodec/mpegvideo.h