diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-08 13:17:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-08 13:25:19 +0200 |
| commit | fe6a36e7687bc94f83f9359b25c137401ddf82cd (patch) | |
| tree | 67bdae5e67964511def1c1a789cf333dae692189 /libavformat/mpjpeg.c | |
| parent | 9818bbde5303f3618c6f428a3ab75ae916821a5d (diff) | |
| parent | e55e8b2c362a60bad66929d83d8c83b0d7f5ffc9 (diff) | |
| download | ffmpeg-fe6a36e7687bc94f83f9359b25c137401ddf82cd.tar.gz | |
Merge commit 'e55e8b2c362a60bad66929d83d8c83b0d7f5ffc9'
* commit 'e55e8b2c362a60bad66929d83d8c83b0d7f5ffc9':
lavc: do not leak frames in avcodec_decode_audio4
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpjpeg.c')
0 files changed, 0 insertions, 0 deletions