[FFmpeg-cvslog] Merge commit '42f9132218ca11a8e9a3c82a175b46bca092113e'

Michael Niedermayer git at videolan.org
Tue Jan 14 21:43:38 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 14 21:37:42 2014 +0100| [1171ad647ebfc03b65fd3a02720edb7f20c00169] | committer: Michael Niedermayer

Merge commit '42f9132218ca11a8e9a3c82a175b46bca092113e'

* commit '42f9132218ca11a8e9a3c82a175b46bca092113e':
  mxf: Do not use int to check the seek position

Conflicts:
	libavformat/mxfdec.c

See: 007989c7a2215f54aeaf2393ab3aff0c208e862f
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1171ad647ebfc03b65fd3a02720edb7f20c00169
---





More information about the ffmpeg-cvslog mailing list