[FFmpeg-cvslog] Merge commit '2004c7c8f763280ff3ba675ea21cf25396528fd3'

Michael Niedermayer git at videolan.org
Fri Apr 12 23:36:58 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 12 22:44:08 2013 +0200| [ed3680bc9b8f7458ed62d252e2da0e141faa0377] | committer: Michael Niedermayer

Merge commit '2004c7c8f763280ff3ba675ea21cf25396528fd3'

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

Conflicts:
	libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ed3680bc9b8f7458ed62d252e2da0e141faa0377
---





More information about the ffmpeg-cvslog mailing list