aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/wmaprodata.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-22 00:09:00 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-22 00:09:00 +0200
commitdd3f1563d7666b631035644ea690c20b00ec91de (patch)
treef84e0be8481394b98e42d41c135460f4872799b5 /libavcodec/wmaprodata.h
parent979062fe2febb502e8b75e944e61673cf70c79b7 (diff)
parentb69183f65d0f6f4cd7a4e6c0deb57d59b0185aba (diff)
downloadffmpeg-dd3f1563d7666b631035644ea690c20b00ec91de.tar.gz
Merge commit 'b69183f65d0f6f4cd7a4e6c0deb57d59b0185aba'
* commit 'b69183f65d0f6f4cd7a4e6c0deb57d59b0185aba': nutenc: check for negative index rather than assert Conflicts: libavformat/nutenc.c Not merged, the assert is correct Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmaprodata.h')
0 files changed, 0 insertions, 0 deletions