ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Wed Aug 13
23:02:56 2014 +0200| [f01a1281ee82c82f64f1879d99cce3807f5fcf05] | committer:
Michael Niedermayer
Merge commit '019d3fccc4dcf5c8379112f697ce9eb08edee9b9'
* commit '019d3fccc4dcf5c8379112f697ce9eb08edee9b9':
Set protocol-level metadata in AVFormatContext any time a packet is read.
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f01a1281ee82c82f64f1879d99cce3807f5fcf05
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
