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

Merge commit '49568851' 


* commit '49568851':
  shorten: Use a checked bytestream reader for the wave header

Conflicts:
	libavcodec/shorten.c

See: 5e9a56a0
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents af539319 49568851
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 17 additions and 15 deletions
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