[FFmpeg-cvslog] Merge commit '5cdefc02079a5b899bdec09e15e2bb099cb01734'

Michael Niedermayer git at videolan.org
Thu Sep 19 12:50:32 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 19 12:44:06 2013 +0200| [257f11820bdf628648466ce07ee0bf67217b543e] | committer: Michael Niedermayer

Merge commit '5cdefc02079a5b899bdec09e15e2bb099cb01734'

* commit '5cdefc02079a5b899bdec09e15e2bb099cb01734':
  aacdec: Add support for Error Resilience syntax.

Conflicts:
	Changelog
	libavcodec/aacdec.c

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

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





More information about the ffmpeg-cvslog mailing list