OSDN Git Service

Merge commit '7b3214d0050613bd347a2e41c9f78ffb766da25e'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 17:05:11 +0000 (17:05 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 17:05:11 +0000 (17:05 +0000)
commit7e49cdd12973ceea7545bf43966de563ce92bcf7
treeb018d11ae7388ef6bec7bc91871bc6f1f09a321e
parentef9915a0e2435a6dc4562c6cf0727408e46c9172
parent7b3214d0050613bd347a2e41c9f78ffb766da25e
Merge commit '7b3214d0050613bd347a2e41c9f78ffb766da25e'

* commit '7b3214d0050613bd347a2e41c9f78ffb766da25e':
  lavc: add a field for passing AVHWFramesContext to encoders

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
doc/APIchanges
libavcodec/avcodec.h
libavcodec/utils.c
libavcodec/version.h