ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sun Feb 22 23:54:11 2015 +0100| [db4a2976f6afb6ac16bdd455695dcc277a03416d] | committer: Michael Niedermayer
Merge commit 'c99915f7c74ce1249d8633cb6fd09035b8d84db7' * commit 'c99915f7c74ce1249d8633cb6fd09035b8d84db7': rtpdec: DV depacketizer (RFC 6469) Conflicts: Changelog libavformat/Makefile libavformat/rtpdec_dv.c libavformat/version.h See: cbe508553ad17b277d4cb6f12f61aac4f52908b8 Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=db4a2976f6afb6ac16bdd455695dcc277a03416d --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog