diff options
author | Timothy Gu <timothygu99@gmail.com> | 2016-08-03 17:47:06 -0700 |
---|---|---|
committer | Timothy Gu <timothygu99@gmail.com> | 2016-08-03 17:47:06 -0700 |
commit | d3426fb5921d069cd950e43504b005bfbb1686d2 (patch) | |
tree | 3f4bfbc1d84c8f3bab88a128ca57dc5adf822e7c /libpostproc/postprocess_internal.h | |
parent | 826c780c1209a8bd7e98ad2c532cbee86401e746 (diff) | |
parent | 606fb6c032fa44d9fa1efd4971308c228f2ebfff (diff) | |
download | ffmpeg-d3426fb5921d069cd950e43504b005bfbb1686d2.tar.gz |
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>
Diffstat (limited to 'libpostproc/postprocess_internal.h')
0 files changed, 0 insertions, 0 deletions