[FFmpeg-cvslog] Merge commit 'c9a13a289d0e1607387854127476813a1ee3d34b'
Michael Niedermayer
git at videolan.org
Tue Oct 29 10:31:46 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct 29 10:21:23 2013 +0100| [6bf4edec27de00adac4119a7b8df04d6c0504843] | committer: Michael Niedermayer
Merge commit 'c9a13a289d0e1607387854127476813a1ee3d34b'
* commit 'c9a13a289d0e1607387854127476813a1ee3d34b':
lavc: remove old unused audio conversion functions.
Conflicts:
libavcodec/audioconvert.c
libavcodec/audioconvert.h
Merge only for metadata.
keeping the old API longer reduces the need for applications to be continuously
updated.
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6bf4edec27de00adac4119a7b8df04d6c0504843
---
More information about the ffmpeg-cvslog
mailing list