diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 20:31:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 20:31:29 +0100 |
| commit | 8c677a9f06c5d145da0301cdc3c6bff9ebacb5d7 (patch) | |
| tree | 9c756ade47cc06771cb120f53b5f9c22724717f6 /libswscale/x86/scale.asm | |
| parent | 94a849b8b6c3e4a90361485b2e12a9a5c35833a3 (diff) | |
| parent | 9b8d11a76ae7bca8bbb58abb822138f8b42c776c (diff) | |
| download | ffmpeg-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 'libswscale/x86/scale.asm')
0 files changed, 0 insertions, 0 deletions