diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 01:07:42 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 01:07:46 +0100 |
commit | 635403e078a017c7c9c633976a986573e09ee939 (patch) | |
tree | 575bdc05ff42faa59a962393d90be8841d69f36b /libavfilter/vf_eq.c | |
parent | cfe33c98b74b97e9b06231ffb981aefdb15be189 (diff) | |
parent | 9c9b0218e85fcd969308632f75af48a4ce229541 (diff) | |
download | ffmpeg-635403e078a017c7c9c633976a986573e09ee939.tar.gz |
Merge commit '9c9b0218e85fcd969308632f75af48a4ce229541'
* commit '9c9b0218e85fcd969308632f75af48a4ce229541':
rtpenc_aac: Merge a definition with a declaration
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_eq.c')
0 files changed, 0 insertions, 0 deletions