diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-16 15:21:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-16 15:21:31 +0200 |
| commit | e55092b12b572e53b3970ca261e9205ae4cabcb0 (patch) | |
| tree | 3806ddf57afcebf59653e215b022c81172de6df1 /libavresample/audio_convert.h | |
| parent | afec02afe7e8d001c84b066383e0d72b79c25225 (diff) | |
| parent | f6b6d6ac42c0ee427fcd3fae4c398b2103b491b8 (diff) | |
| download | ffmpeg-streaming-e55092b12b572e53b3970ca261e9205ae4cabcb0.zip ffmpeg-streaming-e55092b12b572e53b3970ca261e9205ae4cabcb0.tar.gz | |
Merge commit 'f6b6d6ac42c0ee427fcd3fae4c398b2103b491b8'
* commit 'f6b6d6ac42c0ee427fcd3fae4c398b2103b491b8':
vf_frei0r: use the name 's' for the pointer to the private context
vf_format: use the name 's' for the pointer to the private context
vf_fieldorder: use the name 's' for the pointer to the private context
vf_fieldorder: cosmetics, remove an extra linebreak
Conflicts:
libavfilter/vf_frei0r.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/audio_convert.h')
0 files changed, 0 insertions, 0 deletions
