diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-23 02:45:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-23 02:45:00 +0200 |
| commit | 35fe089dd9b667bb5e7537b35a0d03b6bcb01b0c (patch) | |
| tree | 5c4bdb61ca0673b0644ad904740acaf39964b1db /tools/zmqshell.py | |
| parent | 9e6d8c309f2763364ca2aaab801963a302bdfe82 (diff) | |
| parent | b3f48a5044fd04539337e91d28022207c9d3b9e8 (diff) | |
| download | ffmpeg-35fe089dd9b667bb5e7537b35a0d03b6bcb01b0c.tar.gz | |
Merge commit 'b3f48a5044fd04539337e91d28022207c9d3b9e8' into release/2.2
* commit 'b3f48a5044fd04539337e91d28022207c9d3b9e8':
proresenc: Remove unneeded parameters from encode_alpha_plane()
Conflicts:
libavcodec/proresenc_kostya.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/zmqshell.py')
0 files changed, 0 insertions, 0 deletions