[FFmpeg-cvslog] Merge commit '33c859c142ef3f49b7a6227014ad92a680cf4d74'
Michael Niedermayer
git at videolan.org
Tue Feb 4 16:07:43 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 4 15:37:05 2014 +0100| [073e771c9c5330216bdb3def5bd3ab671930b27f] | committer: Michael Niedermayer
Merge commit '33c859c142ef3f49b7a6227014ad92a680cf4d74'
* commit '33c859c142ef3f49b7a6227014ad92a680cf4d74':
lavf: ignore attachment streams for interleaving purposes
Conflicts:
libavformat/avformat.h
libavformat/internal.h
libavformat/mux.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=073e771c9c5330216bdb3def5bd3ab671930b27f
---
More information about the ffmpeg-cvslog
mailing list