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

Merge commit 'd754ed41' 


* commit 'd754ed41':
  riffenc: take an AVStream instead of an AVCodecContext

Conflicts:
	libavformat/nutenc.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 95398aa9 d754ed41
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