[FFmpeg-cvslog] Merge commit 'a42e3a6700547e4e49445bda81d3a89ec3e081a9'
Michael Niedermayer
git at videolan.org
Sun Sep 1 13:06:57 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Sep 1 13:00:08 2013 +0200| [cb4d05e7f25684fd09b5a81bf5d5ca98ecfec6ca] | committer: Michael Niedermayer
Merge commit 'a42e3a6700547e4e49445bda81d3a89ec3e081a9'
* commit 'a42e3a6700547e4e49445bda81d3a89ec3e081a9':
pcm_dvd: consolidate pieces from pcm.c and mpeg.c
Conflicts:
libavcodec/pcm.c
libavcodec/version.h
libavformat/mpeg.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cb4d05e7f25684fd09b5a81bf5d5ca98ecfec6ca
---
More information about the ffmpeg-cvslog
mailing list