OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6bab343 70ecc17)
Merge commit '70ecc175c7b513a153ac87d1c5d219556ca55070'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Jul 2013 08:15:50 +0000 (10:15 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Jul 2013 08:15:50 +0000 (10:15 +0200)
* commit '70ecc175c7b513a153ac87d1c5d219556ca55070':
  alsdec: Fix the clipping range

Conflicts:
libavcodec/alsdec.c

See: feaff427c0df015146f660199453bd8c0314e677

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/alsdec.c patch | diff1 | diff2 | blob | history

diff --cc libavcodec/alsdec.c
Simple merge
external/ffmpeg
About OSDN
Find Software
Develop Software
Help