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

Merge commit '26a44143' 


* commit '26a44143':
  avplay: remove a warning

Conflicts:
	ffplay.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 54056c14 26a44143
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition 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