Skip to content
Snippets Groups Projects
Commit 8fee1561 authored by Wim Taymans's avatar Wim Taymans
Browse files

Merge remote-tracking branch 'origin/0.10'

Conflicts:
	ext/libswscale/gstffmpegscale.c
parents 5c9d4545 b053a505
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment