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

Merge remote-tracking branch 'qatar/master' 


* qatar/master:
  wtv: Drop some casts that now are unnecessary

Conflicts:
	libavformat/wtv.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 90279285 979e9e8f
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 4 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment