OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: df5e089 79922d7)
Merge commit '79922d7237aba2b8c6abbd2e06a0c08e4f498ad4'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Oct 2012 13:50:45 +0000 (15:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Oct 2012 13:52:04 +0000 (15:52 +0200)
* commit '79922d7237aba2b8c6abbd2e06a0c08e4f498ad4':
  wav: do not fail on empty INFO tags

Conflicts:
libavformat/wavdec.c

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

Trivial merge
external/ffmpeg
About OSDN
Find Software
Develop Software
Help