[FFmpeg-cvslog] Merge commit 'd9432789bd119f0e37bcf65cebda05d36aafd4ed'

Michael Niedermayer git at videolan.org
Thu Aug 7 02:41:51 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug  7 02:35:39 2014 +0200| [71f33051e5d012ccf24d447ba7c01a867f8e77c1] | committer: Michael Niedermayer

Merge commit 'd9432789bd119f0e37bcf65cebda05d36aafd4ed'

* commit 'd9432789bd119f0e37bcf65cebda05d36aafd4ed':
  movenc: remove pointless loop around BITEXACT test

Conflicts:
	libavformat/movenc.c

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

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





More information about the ffmpeg-cvslog mailing list