[FFmpeg-cvslog] Merge commit 'b7b1bf9166ac3102c401295fdd5d4933c512aa50'

Michael Niedermayer git at videolan.org
Thu Aug 7 21:21:58 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug  7 21:16:06 2014 +0200| [ec0b08d20b73c9257fad31838ba7837f51dcfee6] | committer: Michael Niedermayer

Merge commit 'b7b1bf9166ac3102c401295fdd5d4933c512aa50'

* commit 'b7b1bf9166ac3102c401295fdd5d4933c512aa50':
  mpegts: K&R formatting cosmetics

Conflicts:
	libavformat/mpegtsenc.c

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

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





More information about the ffmpeg-cvslog mailing list