aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/xiph.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-17 22:39:32 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-17 22:39:32 +0100
commit7a7b77e6c97aabb654414044a000e8c4e9d52575 (patch)
tree947e09bb5fa85d2baaa077682facfe33f48857d9 /libavcodec/xiph.h
parent3d5c0ba816b97d45ccba229ed1a0ff9d82952e1e (diff)
parent31dc73e92a96f08d07650c0e7d31c0b9a1465d46 (diff)
downloadffmpeg-7a7b77e6c97aabb654414044a000e8c4e9d52575.tar.gz
Merge commit '31dc73e92a96f08d07650c0e7d31c0b9a1465d46'
* commit '31dc73e92a96f08d07650c0e7d31c0b9a1465d46': vorbisdec: Check memory allocations Conflicts: libavcodec/vorbisdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xiph.h')
0 files changed, 0 insertions, 0 deletions