ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sat Apr 4 02:15:23 2015 +0200| [241913c0d041e09ddded851a47e0a4a7d6f88561] | committer: Michael Niedermayer
Merge remote-tracking branch 'cehoyos/master' * cehoyos/master: Fix codec fps diplay for very small fps. lavf/mpeg: Support alaw in Hikvision CCTV recordings. lavf/mpeg: Support more audio codecs in Hikvision CCTV recordings. Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=241913c0d041e09ddded851a47e0a4a7d6f88561 --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
