diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-14 11:41:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-14 11:50:40 +0200 |
| commit | 8da4305eb520bb4624df633ef124089fcfba8e6d (patch) | |
| tree | 9c37cc9b56f573fd711696c55bd4926dc46be655 /libavdevice/alsa-audio-enc.c | |
| parent | 1dee467d262d5b376fa506a0da5325b12ceea51a (diff) | |
| parent | 2df0776c2293efb0ac12c003843ce19332342e01 (diff) | |
| download | ffmpeg-8da4305eb520bb4624df633ef124089fcfba8e6d.tar.gz | |
Merge commit '2df0776c2293efb0ac12c003843ce19332342e01'
* commit '2df0776c2293efb0ac12c003843ce19332342e01':
nuv: Use av_fast_realloc
Conflicts:
libavcodec/nuv.c
This change is not merged, the long ago fixed buffer use after codec_reinit()
was a bug.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/alsa-audio-enc.c')
0 files changed, 0 insertions, 0 deletions