]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* 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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.