Merge commit 'b5b7b75e91e291c810ebd01868a42b53f267a87c'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Feb 2013 11:05:53 +0000 (12:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Feb 2013 11:05:53 +0000 (12:05 +0100)
commitbcb15e66f7c46e036be198ecc9ea5f66dc0a537c
treea8bc011dd05f8a723a6259d120288bc536be5498
parent55151aa1013b6bf83b82b5535a7d085202fe49b3
parentb5b7b75e91e291c810ebd01868a42b53f267a87c
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@gmx.at>
libavcodec/dsputil.h
libavcodec/motion_est.c
libavcodec/snowenc.c