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

Merge remote-tracking branch 'cigaes/master'


* cigaes/master:
  lavfi: add comments to explain the negotiation loop.
  lavfi: fix filter format negotiation loop.
  ffmpeg: move a local variable definition later.

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents a527e692 4582e4c0
No related branches found
No related tags found
Loading
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