]> git.sesse.net Git - ffmpeg/commit
Merge commit '6a8b35dc88b4a1a452f192fbbf53ae7f59bc3f23'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 23:57:21 +0000 (00:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 23:57:25 +0000 (00:57 +0100)
commit55f53f6c29acd459df64abf20cbd016c420b6cf6
tree6d35adec5646a2c9a3c8bf9187d18299d1a3a098
parentfdf4eb7911b37e49716b5a64004498ff308a8324
parent6a8b35dc88b4a1a452f192fbbf53ae7f59bc3f23
Merge commit '6a8b35dc88b4a1a452f192fbbf53ae7f59bc3f23'

* commit '6a8b35dc88b4a1a452f192fbbf53ae7f59bc3f23':
  dsputilenc_mmx: Merge two assignment blocks with identical conditions

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