]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cb20ca1 6d25c9d)
Merge commit '6d25c9db11e87ec58652de6588448225137b0c57'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 09:26:43 +0000 (11:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 09:26:43 +0000 (11:26 +0200)
* commit '6d25c9db11e87ec58652de6588448225137b0c57':
  dsputil: Make square put/avg_pixels functions local to h264qpel

Conflicts:
libavcodec/dsputil.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/dsputil.c patch | diff1 | diff2 | blob | history

diff --cc libavcodec/dsputil.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.