aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/svq1.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-17 15:50:45 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-17 15:52:04 +0200
commit940ee636301aa73a38e5b3fa025f43901008538b (patch)
treeb9f7f8ffecf54b1586a78236f52d1a4674a9c562 /libavcodec/svq1.c
parentdf5e089da95bc39b71f9cbee4152636758dc2041 (diff)
parent79922d7237aba2b8c6abbd2e06a0c08e4f498ad4 (diff)
downloadffmpeg-940ee636301aa73a38e5b3fa025f43901008538b.tar.gz
Merge commit '79922d7237aba2b8c6abbd2e06a0c08e4f498ad4'
* commit '79922d7237aba2b8c6abbd2e06a0c08e4f498ad4': wav: do not fail on empty INFO tags Conflicts: libavformat/wavdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/svq1.c')
0 files changed, 0 insertions, 0 deletions