ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Thu Sep 25 14:02:55 2014 +0200| [454f98b881fc18c553d56371ac0cd1e703e52571] | committer: Michael Niedermayer
Merge commit '4620affa24eedb167482198aa04126bcedd05620' * commit '4620affa24eedb167482198aa04126bcedd05620': m4vdec: K&R formatting cosmetics Conflicts: libavformat/m4vdec.c Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=454f98b881fc18c553d56371ac0cd1e703e52571 --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog