ffmpeg | branch: master | Michael Niedermayer <[email protected]> | 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 <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ec0b08d20b73c9257fad31838ba7837f51dcfee6
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
