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

Merge commit '93afb6c9' 


* commit '93afb6c9':
  avconv: set output avg_frame_rate when known

Conflicts:
	ffmpeg.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 8636b11b 93afb6c9
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