diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-02 13:01:58 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-02 13:02:09 +0200 |
commit | 4d4ec18b2142b1de4acf72a29748b2a51af0dd59 (patch) | |
tree | 1e6b51a88821118e9750427798b1d3c5af1c96cc /libavformat/swfenc.c | |
parent | 0beff42823223659d75e7382d41a1e2a954bbfad (diff) | |
parent | d0a661d48a2b1466eda2b87ab72720bc63cf8fc1 (diff) | |
download | ffmpeg-4d4ec18b2142b1de4acf72a29748b2a51af0dd59.tar.gz |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Add wmv2 dependency to vc1 compilation.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/swfenc.c')
0 files changed, 0 insertions, 0 deletions