diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-19 20:02:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-19 20:05:11 +0100 |
| commit | 8ea36711b0a85e24a77e1c76b1cb24aa63df217f (patch) | |
| tree | 5699c8de8c2139e55c188a63a0bcb6f013895c83 /libpostproc | |
| parent | 43dc31f7469c873ccf3927c732a9c2d7d85360bb (diff) | |
| parent | ec10a9ab461b26b96eff7bbbb8623f42d8ee04ad (diff) | |
| download | ffmpeg-streaming-8ea36711b0a85e24a77e1c76b1cb24aa63df217f.zip ffmpeg-streaming-8ea36711b0a85e24a77e1c76b1cb24aa63df217f.tar.gz | |
Merge remote-tracking branch 'newdev/master'
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Not Pulled:
commit 42cfb3835b5dad327b7dc22740e8b6e482ecfcd2
Author: Mans Rullgard <mans@mansr.com>
Date: Mon Feb 28 18:06:58 2011 +0000
Remove Sonic experimental audio codec
commit 2912e87a6c9264d556734e2bf94a99c64cf9b102
Author: Mans Rullgard <mans@mansr.com>
Date: Fri Mar 18 17:35:10 2011 +0000
Replace FFmpeg with Libav in licence headers
Diffstat (limited to 'libpostproc')
| -rw-r--r-- | libpostproc/postprocess.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c index 92c822b..02d7eae 100644 --- a/libpostproc/postprocess.c +++ b/libpostproc/postprocess.c @@ -71,7 +71,7 @@ try to unroll inner for(x=0 ... loop to avoid these damn if(x ... checks ... */ -//Changelog: use the Subversion log +//Changelog: use git log #include "config.h" #include "libavutil/avutil.h" |
