]> git.sesse.net Git - ffmpeg/commit
Merge commit '2004c7c8f763280ff3ba675ea21cf25396528fd3'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Apr 2013 20:44:08 +0000 (22:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Apr 2013 21:28:23 +0000 (23:28 +0200)
commited3680bc9b8f7458ed62d252e2da0e141faa0377
tree49c876be3835f77c0b9b23f70194f16724098e76
parent0bc34ef02e072363c4abb83145d665b2ee4dc801
parent2004c7c8f763280ff3ba675ea21cf25396528fd3
Merge commit '2004c7c8f763280ff3ba675ea21cf25396528fd3'

* commit '2004c7c8f763280ff3ba675ea21cf25396528fd3':
  x86: dsputil: cosmetics: Remove two pointless variable indirections

Conflicts:
libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/dsputil_mmx.c