ffmpeg | branch: master | Timothy Gu <timothyg...@gmail.com> | Wed Aug  3 
17:47:06 2016 -0700| [d3426fb5921d069cd950e43504b005bfbb1686d2] | committer: 
Timothy Gu

Merge commit '606fb6c032fa44d9fa1efd4971308c228f2ebfff'

* commit '606fb6c032fa44d9fa1efd4971308c228f2ebfff':
  h264: call the hwaccel frame_start() from h264_field_start()

This commit is a noop, as it conflicts with 
3e53211a578fc6b042ceff45b2702335294e0464.

Merged-by: Timothy Gu <timothyg...@gmail.com>

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



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

Reply via email to