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

Merge commit '255d9c57' 


* commit '255d9c57':
  riff: Move demuxing code to a separate file.

Conflicts:
	configure
	libavformat/riff.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 508a5349 255d9c57
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