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

Merge commit '38313626' 


* commit '38313626':
  avconv: do not use the stream codec context for encoding

Conflicts:
	ffmpeg.c
	ffmpeg_opt.c

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