[FFmpeg-cvslog] Merge commit '68e57cde68f3da4c557ca15491fda74d1ea6321e'

Michael Niedermayer git at videolan.org
Sun Jul 14 12:09:43 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul 14 12:05:08 2013 +0200| [198e10b55cc908d9194d34013d212e4b5ff3b42f] | committer: Michael Niedermayer

Merge commit '68e57cde68f3da4c557ca15491fda74d1ea6321e'

* commit '68e57cde68f3da4c557ca15491fda74d1ea6321e':
  ac3dec: Increment channel pointers only once per channel

Conflicts:
	libavcodec/ac3dec.c

See: 7aabeea9ba0e557e834c886de5ea4db8e9a5193d

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

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





More information about the ffmpeg-cvslog mailing list