diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 11:42:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 11:42:18 +0200 |
| commit | a8ff830b79d05b1c03ae7e2551ff7142e0845cec (patch) | |
| tree | 35911c95ac168e57e97871aa0524a43a2b04268e /libavresample | |
| parent | 0aa095483d194c0cfe6acc6dd4c72e545312676e (diff) | |
| parent | 093804a93cc5da3f95f98265a5df116912443cec (diff) | |
| download | ffmpeg-a8ff830b79d05b1c03ae7e2551ff7142e0845cec.tar.gz | |
Merge commit '093804a93cc5da3f95f98265a5df116912443cec'
* commit '093804a93cc5da3f95f98265a5df116912443cec':
avfilter: Add av_cold attributes to init/uninit functions
Conflicts:
libavfilter/af_ashowinfo.c
libavfilter/af_volume.c
libavfilter/src_movie.c
libavfilter/vf_lut.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
0 files changed, 0 insertions, 0 deletions