[FFmpeg-cvslog] Merge commit 'e55e8b2c362a60bad66929d83d8c83b0d7f5ffc9'
Michael Niedermayer
git at videolan.org
Wed May 8 13:37:16 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 8 13:17:19 2013 +0200| [fe6a36e7687bc94f83f9359b25c137401ddf82cd] | committer: Michael Niedermayer
Merge commit 'e55e8b2c362a60bad66929d83d8c83b0d7f5ffc9'
* commit 'e55e8b2c362a60bad66929d83d8c83b0d7f5ffc9':
lavc: do not leak frames in avcodec_decode_audio4
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fe6a36e7687bc94f83f9359b25c137401ddf82cd
---
More information about the ffmpeg-cvslog
mailing list