diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-16 16:36:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-16 16:45:43 +0200 |
| commit | df003cbb565575fe539b06105b76a95db72e8720 (patch) | |
| tree | 996367e987cd9905305241c4e80d2a50ddb9147c /libswresample/version.h | |
| parent | e55092b12b572e53b3970ca261e9205ae4cabcb0 (diff) | |
| parent | 4753f802c00853859b7b4b8fdb79c35e082cb7f8 (diff) | |
| download | ffmpeg-df003cbb565575fe539b06105b76a95db72e8720.tar.gz | |
Merge commit '4753f802c00853859b7b4b8fdb79c35e082cb7f8'
* commit '4753f802c00853859b7b4b8fdb79c35e082cb7f8':
vf_libopencv: use the name 's' for the pointer to the private context
vf_hqdn3d: use the name 's' for the pointer to the private context
vf_hflip: use the name 's' for the pointer to the private context
vf_gradfun: use the name 's' for the pointer to the private context
Conflicts:
libavfilter/vf_gradfun.c
libavfilter/vf_hflip.c
libavfilter/vf_hqdn3d.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/version.h')
0 files changed, 0 insertions, 0 deletions