diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-13 08:43:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-13 08:53:47 +0200 |
| commit | 3ce0eddeab39bf04748c1153ae096e81facd0a6d (patch) | |
| tree | 35edb72b130e53342bbb191044098bf62e202125 /libavcodec/adxenc.c | |
| parent | b6ffe8afd92860a4605f12ac61226dac5e0c03cb (diff) | |
| parent | ed9245dba83f9add60f55718b537b0af2105c60e (diff) | |
| download | ffmpeg-3ce0eddeab39bf04748c1153ae096e81facd0a6d.tar.gz | |
Merge commit 'ed9245dba83f9add60f55718b537b0af2105c60e'
* commit 'ed9245dba83f9add60f55718b537b0af2105c60e':
oggparsevorbis: check allocations
Conflicts:
libavformat/oggparsevorbis.c
See: 033f1644b59abd755bb529afa5db394d18d9c30b
See: 84aea80f7824c23b4cbf101f03e2b5b418a79d80
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adxenc.c')
0 files changed, 0 insertions, 0 deletions