ffmpeg | branch: master | Michael Niedermayer <michae...@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 <michae...@gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=17773f49b7da49ceecc4b6260d5ded6938f9b163
---



_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to