[FFmpeg-cvslog] Merge commit '613a37eca4c7b8eefceaa3e0231c23ad090ca94f'

Michael Niedermayer git at videolan.org
Tue Mar 26 13:19:06 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 26 13:14:16 2013 +0100| [795b911bd8acaec4b6f7dc1590f63a529c028ac8] | committer: Michael Niedermayer

Merge commit '613a37eca4c7b8eefceaa3e0231c23ad090ca94f'

* commit '613a37eca4c7b8eefceaa3e0231c23ad090ca94f':
  ape: 3.80-3.92 decoding support
  h264: Remove an unused variable

Conflicts:
	libavcodec/apedec.c
	libavformat/ape.c

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

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





More information about the ffmpeg-cvslog mailing list