Merge commit 'f1fa1eed2abdc8dfb0af318a43f5d293b81141bd'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jun 2015 19:14:34 +0000 (21:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jun 2015 19:25:21 +0000 (21:25 +0200)
commitdbf172e6f44d1736d27a84fa117dcd6b8460bd4b
tree673fee9ea042991f7ce1891389f3426efcf21c61
parent1189af429211ac650aac730368a6cf5b23756605
parentf1fa1eed2abdc8dfb0af318a43f5d293b81141bd
Merge commit 'f1fa1eed2abdc8dfb0af318a43f5d293b81141bd'

* commit 'f1fa1eed2abdc8dfb0af318a43f5d293b81141bd':
  mpegvideo: Expand macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/flvenc.c
libavcodec/h261enc.c
libavcodec/mjpegenc.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/rv10enc.c
libavcodec/rv20enc.c
libavcodec/wmv2enc.c