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

Merge commit '59444c76' 


* commit '59444c76':
  avconv: add stream-global side data to the first demuxed packet

Conflicts:
	ffmpeg.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents c08e5235 59444c76
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