[FFmpeg-cvslog] Merge commit 'd7705be9617ed691c7a2924a2088de2d96f38af1'
Michael Niedermayer
git at videolan.org
Wed Jun 11 03:09:03 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jun 11 02:57:08 2014 +0200| [b3a647d9ce59cd75ccf4233eac871af91bebf0d0] | committer: Michael Niedermayer
Merge commit 'd7705be9617ed691c7a2924a2088de2d96f38af1'
* commit 'd7705be9617ed691c7a2924a2088de2d96f38af1':
mpegvideoenc: check color_range
Conflicts:
libavcodec/mpegvideo_enc.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b3a647d9ce59cd75ccf4233eac871af91bebf0d0
---
More information about the ffmpeg-cvslog
mailing list