diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-11 02:57:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-11 02:57:08 +0200 |
| commit | b3a647d9ce59cd75ccf4233eac871af91bebf0d0 (patch) | |
| tree | 474a02180a0268c7508d802afd95914a3b6f4c63 /tools/ffhash.c | |
| parent | 1290143fda931596f140dc1c31dd8a158710295e (diff) | |
| parent | d7705be9617ed691c7a2924a2088de2d96f38af1 (diff) | |
| download | ffmpeg-b3a647d9ce59cd75ccf4233eac871af91bebf0d0.tar.gz | |
Merge commit 'd7705be9617ed691c7a2924a2088de2d96f38af1'
* commit 'd7705be9617ed691c7a2924a2088de2d96f38af1':
mpegvideoenc: check color_range
Conflicts:
libavcodec/mpegvideo_enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/ffhash.c')
0 files changed, 0 insertions, 0 deletions