Merge commit 'd8520d3ee032bf18f28897e0109f44b405caf5e3'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Jul 2014 00:47:04 +0000 (02:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Jul 2014 00:47:32 +0000 (02:47 +0200)
commit7295ee7f51d9567526537228f2a0cd47c11db9c3
tree33624379cd18bdbecfd261d25893b0a374e3b795
parent8b395315a5e7eba743d815f0b9c3a42aaeefd297
parentd8520d3ee032bf18f28897e0109f44b405caf5e3
Merge commit 'd8520d3ee032bf18f28897e0109f44b405caf5e3'

* commit 'd8520d3ee032bf18f28897e0109f44b405caf5e3':
  mpegvideo: Move QMAT_SHIFT* defines to the only place they are used

Conflicts:
libavcodec/mpegvideo.h

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