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

Merge commit '2d66a58c' 


* commit '2d66a58c':
  Go2Webinar decoder

Conflicts:
	Changelog
	configure
	libavcodec/avcodec.h
	libavcodec/codec_desc.c
	libavcodec/version.h
	libavformat/riff.c

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