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

Merge remote-tracking branch 'qatar/master' 


* qatar/master:
  avconv: don't warn on multiple frames per packet for codecs that expect it

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 1046cd60 d1780e01
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 1 deletion
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