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

Merge commit 'fa14804c' 


* commit 'fa14804c':
  flv: Index the audio stream

Conflicts:
	libavformat/flvdec.c

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