[FFmpeg-cvslog] Merge commit 'b5b7b75e91e291c810ebd01868a42b53f267a87c'

Michael Niedermayer git at videolan.org
Sat Feb 9 12:10:34 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Feb  9 12:05:53 2013 +0100| [bcb15e66f7c46e036be198ecc9ea5f66dc0a537c] | committer: Michael Niedermayer

Merge commit 'b5b7b75e91e291c810ebd01868a42b53f267a87c'

* commit 'b5b7b75e91e291c810ebd01868a42b53f267a87c':
  dsputil: Move get_penalty_factor() to the only place it is used.

Conflicts:
	libavcodec/dsputil.h

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

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





More information about the ffmpeg-cvslog mailing list