diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-17 12:13:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-17 12:13:22 +0200 |
| commit | 15141f939dc725451644869f4d413adb46927677 (patch) | |
| tree | e0aba01c6ebbe093e4b3265ae94f639628c1053f /libavfilter/af_aresample.c | |
| parent | 68ca49dc7256bbe413ce29fa3fc47bb4143304c0 (diff) | |
| parent | 8b84e082ed27fb635fca524fbd14b1db094ee8b0 (diff) | |
| download | ffmpeg-15141f939dc725451644869f4d413adb46927677.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
indeo3: add parens around some macro arguments
h264: use proper PROLOGUE statement for a function using 8 registers.
doc: Update sample Vim config with suitable (function) indentation settings.
dv: Merge dvquant.h into dvdata.c where all other DV tables reside.
dv: Move static tables only used in one place to where they are used.
graphparser: set next to NULL on an entry extracted from inputs list
doc/filters: update documentation.
avconv: flush decoders immediately after an EOF.
avconv: send EOF to vsrc_buffer.
avconv: reindent.
Conflicts:
doc/filters.texi
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_aresample.c')
0 files changed, 0 insertions, 0 deletions