Skip to content

F
ffmpeg
Commit 3bc3c78a authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

Merge commit '6d25c9db' 

* commit '6d25c9db':
  dsputil: Make square put/avg_pixels functions local to h264qpel

Conflicts:
	libavcodec/dsputil.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents cb20ca14 6d25c9db
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 0 deletions
Markdown is supported
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