[FFmpeg-cvslog] Merge commit '8411baf6f0a42bdd61f00f34aa9efec7e138b5f2'

Michael Niedermayer git at videolan.org
Wed Sep 18 10:45:37 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep 18 10:39:34 2013 +0200| [f9ccdcb6ce0a874c81c41c2a42f609a8cdc5ddae] | committer: Michael Niedermayer

Merge commit '8411baf6f0a42bdd61f00f34aa9efec7e138b5f2'

* commit '8411baf6f0a42bdd61f00f34aa9efec7e138b5f2':
  dca_parser: Handle changes in DCA frame size

Conflicts:
	libavcodec/dca_parser.c

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

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





More information about the ffmpeg-cvslog mailing list