Merge commit 'd75190aa93206c02cb4f18a66d2c927d6a0198e1'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Dec 2014 20:27:05 +0000 (21:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Dec 2014 20:27:10 +0000 (21:27 +0100)
commit38c3ffbd55deb91622a58d8e20b15d263aadf131
tree75c675e884aa74af613d4cf35d32b151f5844bc7
parent0a3ffcfc8224d38b3fe635d243ff1ec74df17c84
parentd75190aa93206c02cb4f18a66d2c927d6a0198e1
Merge commit 'd75190aa93206c02cb4f18a66d2c927d6a0198e1'

* commit 'd75190aa93206c02cb4f18a66d2c927d6a0198e1':
  mpegvideo: move REBASE_PICTURE where it is used

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