diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-06 19:58:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-06 20:00:59 +0200 |
| commit | 225c5cc8153588d61d65ec1afc1e843425d12785 (patch) | |
| tree | 02f2f9de16b9b7b0c69b105dd37d893b52a4afe1 /presets | |
| parent | 3a29af4efc608d63bac72bf1572aff45cab22766 (diff) | |
| parent | 373a6dda5422186bc057297342a9e559a564595e (diff) | |
| download | ffmpeg-225c5cc8153588d61d65ec1afc1e843425d12785.tar.gz | |
Merge commit '373a6dda5422186bc057297342a9e559a564595e'
* commit '373a6dda5422186bc057297342a9e559a564595e':
cljr: split decoder and encoder
Conflicts:
libavcodec/Makefile
libavcodec/cljrdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'presets')
0 files changed, 0 insertions, 0 deletions