aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/libgme.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-12-09 20:31:29 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-12-09 20:31:29 +0100
commit8c677a9f06c5d145da0301cdc3c6bff9ebacb5d7 (patch)
tree9c756ade47cc06771cb120f53b5f9c22724717f6 /libavformat/libgme.c
parent94a849b8b6c3e4a90361485b2e12a9a5c35833a3 (diff)
parent9b8d11a76ae7bca8bbb58abb822138f8b42c776c (diff)
downloadffmpeg-8c677a9f06c5d145da0301cdc3c6bff9ebacb5d7.tar.gz
Merge commit '9b8d11a76ae7bca8bbb58abb822138f8b42c776c'
* commit '9b8d11a76ae7bca8bbb58abb822138f8b42c776c': avcodec: Use av_reallocp where suitable Conflicts: libavcodec/bitstream.c libavcodec/eatgv.c libavcodec/flashsv.c libavcodec/libtheoraenc.c libavcodec/libvpxenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/libgme.c')
0 files changed, 0 insertions, 0 deletions