[FFmpeg-cvslog] Merge commit '9c09fbd8053292267cdc4b542913ceced43ea3a9'
Michael Niedermayer
git at videolan.org
Thu Mar 5 10:28:42 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 5 10:10:23 2015 +0100| [63ea3a86b7ce7c4f6dca40387fb948a9bb9b2b9b] | committer: Michael Niedermayer
Merge commit '9c09fbd8053292267cdc4b542913ceced43ea3a9'
* commit '9c09fbd8053292267cdc4b542913ceced43ea3a9':
rtpdec: experimental VP9 depacketizer (draft 0)
Conflicts:
libavformat/rtpdec.c
libavformat/rtpdec_vp9.c
libavformat/version.h
See: e4a6486c17dd90b338450ac7e151ffbf5370948a
See: f966ac2b6e3f08c41f3c45ab5efff768db62ac5a
See: 629a03a9128bd2e51286258e12183b1d06f509a7
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=63ea3a86b7ce7c4f6dca40387fb948a9bb9b2b9b
---
More information about the ffmpeg-cvslog
mailing list