]> git.sesse.net Git - ffmpeg/commit
projects / ffmpeg / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 826c780 606fb6c)
Merge commit '606fb6c032fa44d9fa1efd4971308c228f2ebfff'
authorTimothy Gu <timothygu99@gmail.com>
Thu, 4 Aug 2016 00:47:06 +0000 (17:47 -0700)
committerTimothy Gu <timothygu99@gmail.com>
Thu, 4 Aug 2016 00:47:06 +0000 (17:47 -0700)
commitd3426fb5921d069cd950e43504b005bfbb1686d2
tree3f4bfbc1d84c8f3bab88a128ca57dc5adf822e7ctree | snapshot
parent826c780c1209a8bd7e98ad2c532cbee86401e746commit | diff
parent606fb6c032fa44d9fa1efd4971308c228f2ebfffcommit | diff
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 <timothygu99@gmail.com>
Unnamed repository; edit this file 'description' to name the repository.