diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-09 12:05:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-09 12:05:53 +0100 |
| commit | bcb15e66f7c46e036be198ecc9ea5f66dc0a537c (patch) | |
| tree | a8bc011dd05f8a723a6259d120288bc536be5498 /libavcodec/ws-snd1.c | |
| parent | 55151aa1013b6bf83b82b5535a7d085202fe49b3 (diff) | |
| parent | b5b7b75e91e291c810ebd01868a42b53f267a87c (diff) | |
| download | ffmpeg-bcb15e66f7c46e036be198ecc9ea5f66dc0a537c.tar.gz | |
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>
Diffstat (limited to 'libavcodec/ws-snd1.c')
0 files changed, 0 insertions, 0 deletions