[FFmpeg-cvslog] Merge commit 'befe044bb9561c9d7d6559db06bba375e82a4b66'

Michael Niedermayer git at videolan.org
Fri Sep 6 13:33:16 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep  6 13:17:12 2013 +0200| [c4a696fb546576759467358d5258268a30aaa4d3] | committer: Michael Niedermayer

Merge commit 'befe044bb9561c9d7d6559db06bba375e82a4b66'

* commit 'befe044bb9561c9d7d6559db06bba375e82a4b66':
  avcodec: Stop exporting the removed audio_resample* symbols

Conflicts:
	libavcodec/libavcodec.v

Not merged as theres no pressing need to remove it now.

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

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





More information about the ffmpeg-cvslog mailing list