Skip to content
Snippets Groups Projects
Commit c48e8d9d authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '59b55c49' 


* commit '59b55c49':
  lavc: deprecate unused me_threshold field

Conflicts:
	ffmpeg.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents fc67d937 59b55c49
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment