diff options
| author | Michael Niedermayer <[email protected]> | 2014-08-18 20:01:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-08-18 20:01:14 +0200 |
| commit | 43b769b0c4f438d3f261d53f7fbd23e28606e78a (patch) | |
| tree | ca63a9d92896b2d540eeaa375119c0ec0d0fa390 /libavcodec/rtjpeg.h | |
| parent | 3f0c76e26205f867b089ac56d7cb14bf8d984ef0 (diff) | |
| parent | b16699f2da9c1d41eff852ec3a0c81f74fd44421 (diff) | |
Merge commit 'b16699f2da9c1d41eff852ec3a0c81f74fd44421'
* commit 'b16699f2da9c1d41eff852ec3a0c81f74fd44421':
proresenc: Remove unneeded parameters from encode_alpha_plane()
Conflicts:
libavcodec/proresenc_kostya.c
See: bf10f09bccdcfdb41b9f5bbae01d55961bfd0693
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/rtjpeg.h')
0 files changed, 0 insertions, 0 deletions