Merge commit 'd7705be9617ed691c7a2924a2088de2d96f38af1'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Jun 2014 00:57:08 +0000 (02:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Jun 2014 00:57:08 +0000 (02:57 +0200)
commitb3a647d9ce59cd75ccf4233eac871af91bebf0d0
tree474a02180a0268c7508d802afd95914a3b6f4c63
parent1290143fda931596f140dc1c31dd8a158710295e
parentd7705be9617ed691c7a2924a2088de2d96f38af1
Merge commit 'd7705be9617ed691c7a2924a2088de2d96f38af1'

* commit 'd7705be9617ed691c7a2924a2088de2d96f38af1':
  mpegvideoenc: check color_range

Conflicts:
libavcodec/mpegvideo_enc.c

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