diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-02 04:48:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-02 04:48:47 +0200 |
| commit | 96cb1438000075cae2a7f33a1b794df27f18284b (patch) | |
| tree | b333a2202a920ba5f47494479feb6709b493cdc8 /libavcodec/libutvideoenc.cpp | |
| parent | 571572fcddc16ebe3d60054ae5a2db05800c1d6d (diff) | |
| parent | 91c86d3cf8064b3ff28c66a48d3e0c7187df1ab8 (diff) | |
| download | ffmpeg-96cb1438000075cae2a7f33a1b794df27f18284b.tar.gz | |
Merge remote-tracking branch 'dwbuiten/master'
* dwbuiten/master:
Canopus Lossless decoder
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libutvideoenc.cpp')
0 files changed, 0 insertions, 0 deletions