ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Dec 19
03:29:30 2014 +0100| [2e974376570d41b3e7c16fa53b9af2023a81e39a] | committer:
Michael Niedermayer
Merge commit '87bd298abeb901fe16383a0d267502cc7fc03878'
* commit '87bd298abeb901fe16383a0d267502cc7fc03878':
DPX parser
Conflicts:
libavcodec/dpx_parser.c
libavcodec/version.h
See: 8ec328668a7d10c8224ae5f591add5b388ea82ed
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2e974376570d41b3e7c16fa53b9af2023a81e39a
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
