Merge commit '606fb6c032fa44d9fa1efd4971308c228f2ebfff'

Browse Source

* 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>

...

This commit is contained in:

Timothy Gu 2016-08-03 17:47:06 -07:00

parent 826c780c12 606fb6c032

commit d3426fb592

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available