ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Mon 
Jul 13 01:28:36 2015 +0200| [9e810a98a26391fd32f94e984a0a997ad77b77fe] | 
committer: Michael Niedermayer

Merge commit '650060dfb665552442ec11b456660e3e9a9d9016'

* commit '650060dfb665552442ec11b456660e3e9a9d9016':
  hevc_parser: parse and export some stream parameters

Conflicts:
        configure
        libavcodec/hevc_parser.c

Merged-by: Michael Niedermayer <mich...@niedermayer.cc>

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



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

Reply via email to