diff options
| author | Michael Niedermayer <[email protected]> | 2014-03-17 15:51:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-03-17 15:51:45 +0100 |
| commit | ba7cdb970f1cb49ae7a99948dae6b88d163545fe (patch) | |
| tree | e4074b6c4df0bc579ef52be714524c21e9c5ce4c | |
| parent | c738ffcf2c0717ed3546ea7e0d06cc4df2026024 (diff) | |
| parent | 6d78e852fbf3cab438a2085bcb64b90457c4a851 (diff) | |
Merge commit '6d78e852fbf3cab438a2085bcb64b90457c4a851'
* commit '6d78e852fbf3cab438a2085bcb64b90457c4a851':
img2: add j2c file extension
Conflicts:
libavformat/img2enc.c
See: e8df18270a50fd57eab06f1718ad9d075b200d98
Merged-by: Michael Niedermayer <[email protected]>
0 files changed, 0 insertions, 0 deletions