diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-05 11:56:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-05 11:56:48 +0100 |
| commit | 0b6f34cc9f281725fe7aeb011add88e896a2ec81 (patch) | |
| tree | 8bcb82cff3b7f61ab61cdd9f1fc56431382a23b9 /ffserver.c | |
| parent | 103a2c2b1757ac89c48cb76e5f8b5272d0329521 (diff) | |
| parent | e66240f22e240b0f0d970d1b138db80ceb517097 (diff) | |
| download | ffmpeg-0b6f34cc9f281725fe7aeb011add88e896a2ec81.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avfilter: x86: consistent filenames for filter optimizations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
0 files changed, 0 insertions, 0 deletions