diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-18 10:29:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-18 10:48:00 +0200 |
| commit | 17e4b0644b5ad13733bd863b14ab11ffa955009c (patch) | |
| tree | 46cc4748ea765ca0553bac23a49d502c9aed5038 /cmdutils_common_opts.h | |
| parent | eb19d89d8eb51f20299d59558d69d0f057583e7c (diff) | |
| parent | 292d1e78743855404c7d07e3e7cb3f9c9ae6275b (diff) | |
| download | ffmpeg-17e4b0644b5ad13733bd863b14ab11ffa955009c.tar.gz | |
Merge commit '292d1e78743855404c7d07e3e7cb3f9c9ae6275b'
* commit '292d1e78743855404c7d07e3e7cb3f9c9ae6275b':
fate: dependencies for acodec tests
fate: dependencies for vsynth tests
fate: add macros useful for conditionally enabling things
libmp3lame: resize the output buffer if needed
Conflicts:
tests/fate/acodec.mak
tests/fate/vcodec.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils_common_opts.h')
0 files changed, 0 insertions, 0 deletions