[FFmpeg-cvslog] Merge commit '12db891dcd57b305d6e3c1e22ea8204dc26edda1'
Michael Niedermayer
git at videolan.org
Mon Jun 17 00:03:31 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun 16 23:58:59 2013 +0200| [8097307bfb6a90d18d35a870ff61016111820ab7] | committer: Michael Niedermayer
Merge commit '12db891dcd57b305d6e3c1e22ea8204dc26edda1'
* commit '12db891dcd57b305d6e3c1e22ea8204dc26edda1':
avf: move ff_write_chained to mux.c
Conflicts:
libavformat/mux.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8097307bfb6a90d18d35a870ff61016111820ab7
---
More information about the ffmpeg-cvslog
mailing list