aboutsummaryrefslogtreecommitdiffstats
path: root/tests/ffserver.conf
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-04-27 16:48:20 +0100
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-04-27 16:48:30 +0100
commitc0b51aa2d2c66cb52577a287b3b821e89f214514 (patch)
tree473a1c27cc3232fd8e50bb9972ffe7d87fd55a7a /tests/ffserver.conf
parentfed686af232487dad6ec46294b3e5018f11943f1 (diff)
parent89a13998a1b5074411dff5a461dce3837057b0b8 (diff)
downloadffmpeg-c0b51aa2d2c66cb52577a287b3b821e89f214514.tar.gz
Merge commit '89a13998a1b5074411dff5a461dce3837057b0b8'
* commit '89a13998a1b5074411dff5a461dce3837057b0b8': svq3: rip out the svq3-relevant parts of pred_motion() out of h264 Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'tests/ffserver.conf')
0 files changed, 0 insertions, 0 deletions