diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-19 14:15:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-19 14:15:47 +0200 |
| commit | c5fd9d3c35cb743226770e1077e6b082f44bd889 (patch) | |
| tree | e27eecd0a854a9e8a2374410b343f756835a468e /doc/ffserver.conf | |
| parent | 81ff0c24ef050c1877639ecc3ba6c485fde0a74e (diff) | |
| parent | 61cc99748c1107a2f07491ce768156cc74b95e29 (diff) | |
| download | ffmpeg-c5fd9d3c35cb743226770e1077e6b082f44bd889.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: Add proper dependencies in qt.mak
fate: Add proper dependencies in lossless-video.mak
indeo3: do not try to output more lines than we can fit
bmv: get a new frame on every decode_frame(), so we can use direct rendering
Conflicts:
libavcodec/bmv.c
tests/fate/lossless-video.mak
tests/fate/qt.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffserver.conf')
0 files changed, 0 insertions, 0 deletions