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

Merge remote-tracking branch 'cus/stable' 


* cus/stable:
  ffplay: pause rdft column when ffplay is paused

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents a0340dfb e6093e36
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 1 deletion
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