[FFmpeg-cvslog] Merge commit '63f800ca5f4f6b38f3789a7edb03bfabe8bacdd2'

Michael Niedermayer git at videolan.org
Mon Sep 1 21:01:37 CEST 2014 

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Sep  1 20:51:31 2014 +0200| [f626eaa58e69532ff85044007b2ceb3ce8dd5ed2] | committer: Michael Niedermayer

Merge commit '63f800ca5f4f6b38f3789a7edb03bfabe8bacdd2'

* commit '63f800ca5f4f6b38f3789a7edb03bfabe8bacdd2':
  aac_adtstoasc_bsf: Return proper error code

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f626eaa58e69532ff85044007b2ceb3ce8dd5ed2
---

More information about the ffmpeg-cvslog mailing list