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

Merge commit 'c872d310' 


* commit 'c872d310':
  avconv: stop accessing AVStream.parser

Conflicts:
	ffmpeg.h

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 15b1b088 c872d310
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