ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Feb 24 22:26:15 2015 +0100| [a51b192f3b8f89a1bafba629655df55348b14195] | committer: Michael Niedermayer
Merge commit 'db158f0dd217cf839be8af195d66cf49a76537a8' * commit 'db158f0dd217cf839be8af195d66cf49a76537a8': rtpdec: Remove unnecessary _if_needed suffixes on functions Conflicts: libavformat/rtpdec_xiph.c Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a51b192f3b8f89a1bafba629655df55348b14195 --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog