diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-27 11:32:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-27 11:32:45 +0100 |
| commit | ef8ab2f953079106bb4d72f9ce0af9c38f919130 (patch) | |
| tree | 27f03e3bde89a6bfc592dbe288f384c8e81aec2f /libavformat/astenc.c | |
| parent | 914f48ddf0226c2fabcd46cedd90fc622fef4019 (diff) | |
| parent | 3b2d0ec473b036bdd0a5bc0d896fd5292915f44d (diff) | |
| download | ffmpeg-ef8ab2f953079106bb4d72f9ce0af9c38f919130.tar.gz | |
Merge commit '3b2d0ec473b036bdd0a5bc0d896fd5292915f44d'
* commit '3b2d0ec473b036bdd0a5bc0d896fd5292915f44d':
configure: Remove the mpegvideo dependency from svq1
x86: vc1dsp: Fix indentation
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/astenc.c')
0 files changed, 0 insertions, 0 deletions