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

Merge commit '031be5b4' 


* commit '031be5b4':
  ac3dec: Consistently use AC3_BLOCK_SIZE and sizeof

Conflicts:
	libavcodec/ac3dec.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 198e10b5 031be5b4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 3 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