diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-12 11:46:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-12 11:46:47 +0200 |
| commit | ac0f1ae64bac87e8d97be5793ebb5638ac0162c3 (patch) | |
| tree | 31aaa07c62634415bd75d578925169ec739dd729 /libavfilter/af_aconvert.c | |
| parent | f9dd2e5e1a6c4012806001d9d4420825bb67bbb5 (diff) | |
| parent | 76fa7e09f18d5efa6b9c8ec5ef8d032a85e15865 (diff) | |
| download | ffmpeg-ac0f1ae64bac87e8d97be5793ebb5638ac0162c3.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
utvideoenc: Add missing AV_ prefix to codec ID
avserver: Add missing #include for av_gettime()
configure: Only disable aligned stack on MSVC on 32 bit
configure: indentation cosmetics
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_aconvert.c')
0 files changed, 0 insertions, 0 deletions