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

Merge commit 'd2a25c40' 


* commit 'd2a25c40':
  get_buffer(): do not initialize the data.

Conflicts:
	libavcodec/utils.c

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