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

Merge commit '79dad2a9' 


* commit '79dad2a9':
  dsputil: Separate h264chroma

Conflicts:
	libavcodec/dsputil_template.c
	libavcodec/ppc/dsputil_ppc.c
	libavcodec/vc1dec.c
	libavcodec/vc1dsp.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents b5884db4 79dad2a9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 340 additions and 175 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment