[FFmpeg-cvslog] Merge commit 'a10c4ce24bd4a0dd557d5849aa53a0cc74677808'
Michael Niedermayer
git at videolan.org
Mon Aug 5 09:57:01 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug 5 09:52:06 2013 +0200| [d6c36fba0be8aaa7ba3f15f8a2a7b872817200f3] | committer: Michael Niedermayer
Merge commit 'a10c4ce24bd4a0dd557d5849aa53a0cc74677808'
* commit 'a10c4ce24bd4a0dd557d5849aa53a0cc74677808':
aac: Forward errors properly in aac_decode_frame_int
Conflicts:
libavcodec/aacdec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d6c36fba0be8aaa7ba3f15f8a2a7b872817200f3
---
More information about the ffmpeg-cvslog
mailing list