diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-26 12:50:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-26 12:50:34 +0100 |
| commit | 6fbddc80d63ddbc8974f4b2e286de20def6c201d (patch) | |
| tree | 327dd7a19fba89a54ba3333fba3545e7598d3e96 /presets | |
| parent | 13fa074173269308f5051bb1a683c9ed54ab8735 (diff) | |
| parent | e8da807537e314d74cb6d93598f1dcfb891fa655 (diff) | |
| download | ffmpeg-6fbddc80d63ddbc8974f4b2e286de20def6c201d.tar.gz | |
Merge commit 'e8da807537e314d74cb6d93598f1dcfb891fa655'
* commit 'e8da807537e314d74cb6d93598f1dcfb891fa655':
cmdutils: only use libavresample when it is enabled
libschroedinger: cosmetics: rename variable avccontext to avctx
vorbisenc: cosmetics: rename variable avccontext to avctx
Conflicts:
cmdutils.c
libavcodec/libschroedinger.c
libavcodec/libschroedingerenc.c
libavcodec/vorbisenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'presets')
0 files changed, 0 insertions, 0 deletions