diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-08 21:58:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-08 22:00:09 +0200 |
| commit | d5a3caef93026abebaa73f4b9c747004a1457fd7 (patch) | |
| tree | dc24d134264dcc61fd87a0a8779abf3224c0eef0 /libavcodec/libutvideoenc.cpp | |
| parent | 9da679e77fa25487ae37db11f010fde68034e362 (diff) | |
| parent | 04d14c9b68b03e8dbc6e3003c1ee06892dd32576 (diff) | |
| download | ffmpeg-d5a3caef93026abebaa73f4b9c747004a1457fd7.tar.gz | |
Merge commit '04d14c9b68b03e8dbc6e3003c1ee06892dd32576'
* commit '04d14c9b68b03e8dbc6e3003c1ee06892dd32576':
vc1: Split the decoder in components
Conflicts:
libavcodec/Makefile
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libutvideoenc.cpp')
0 files changed, 0 insertions, 0 deletions