[FFmpeg-cvslog] Merge commit '0420c810ceb430003f9f2793c5cfa1fe84657f3d'
Michael Niedermayer
git at videolan.org
Fri Jul 5 12:48:58 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 5 12:37:13 2013 +0200| [8fdec02fd1951dd8eb5cf6accd890d66b766edb3] | committer: Michael Niedermayer
Merge commit '0420c810ceb430003f9f2793c5cfa1fe84657f3d'
* commit '0420c810ceb430003f9f2793c5cfa1fe84657f3d':
log: pass the correct parameters to missing_feature_sample
Conflicts:
libavutil/log.c
See: 572e38a513139b21c35acfef13aa7c4e307ab648
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8fdec02fd1951dd8eb5cf6accd890d66b766edb3
---
More information about the ffmpeg-cvslog
mailing list