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

Merge commit '12576afe' 


* commit '12576afe':
  adpcm: Write the correct number of samples for ima-dk4

Conflicts:
	libavcodec/adpcm.c

See: f18c873a

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents a3d9a216 12576afe
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 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