OSDN Git Service

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)
commit940ee636301aa73a38e5b3fa025f43901008538b
treeb9f7f8ffecf54b1586a78236f52d1a4674a9c562
parentdf5e089da95bc39b71f9cbee4152636758dc2041
parent79922d7237aba2b8c6abbd2e06a0c08e4f498ad4
Merge commit '79922d7237aba2b8c6abbd2e06a0c08e4f498ad4'

* commit '79922d7237aba2b8c6abbd2e06a0c08e4f498ad4':
  wav: do not fail on empty INFO tags

Conflicts:
libavformat/wavdec.c

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