opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-06 07:40:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'newdev/master'

Browse Source 
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
This commit is contained in:
Michael Niedermayer
2011-03-19 20:02:42 +01:00
parent 43dc31f746 ec10a9ab46
commit 8ea36711b0
9 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libpostproc/postprocess.c
View File

@ -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"