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

Merge commit 'bff36075' 


* commit 'bff36075':
  lavc: set the default rc_initial_buffer_occupancy

Conflicts:
	libavcodec/utils.c

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