[FFmpeg-cvslog] Merge commit '3567b91e49c6ae101c9a35c90f46b8ad9890ac15'
Michael Niedermayer
git at videolan.org
Tue Feb 24 23:30:12 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 24 23:23:26 2015 +0100| [17773f49b7da49ceecc4b6260d5ded6938f9b163] | committer: Michael Niedermayer
Merge commit '3567b91e49c6ae101c9a35c90f46b8ad9890ac15'
* commit '3567b91e49c6ae101c9a35c90f46b8ad9890ac15':
rtpdec_hevc: Share the implementation of fragmented packets with h264
Conflicts:
libavformat/rtpdec_h264.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=17773f49b7da49ceecc4b6260d5ded6938f9b163
---
More information about the ffmpeg-cvslog
mailing list