diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 17:45:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 17:45:06 +0100 |
| commit | 5f8f9dc4362b12c78189fb9e3d8587fae4fee987 (patch) | |
| tree | 5200866be8a227b532f6225557c2a384555e6bcd /libavcodec/cljr.c | |
| parent | 6db37c9468051ff34cac58fa428bc5d86fc1ee45 (diff) | |
| parent | 45235ac488363e3360bf2f2275102d1ec66eba0f (diff) | |
| download | ffmpeg-5f8f9dc4362b12c78189fb9e3d8587fae4fee987.tar.gz | |
Merge commit '45235ac488363e3360bf2f2275102d1ec66eba0f'
* commit '45235ac488363e3360bf2f2275102d1ec66eba0f':
configure: Move x11grab option to a more suitable place in the help output
lavr: allow setting internal_sample_fmt option by string
lavr: Add "resample_cutoff" option as a duplicate of "cutoff"
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cljr.c')
0 files changed, 0 insertions, 0 deletions