OSDN Git Service

Merge commit '901f9c0a32985f48672fd68594111dc55d88a57a'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 14 Oct 2015 12:56:16 +0000 (14:56 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 14 Oct 2015 12:56:16 +0000 (14:56 +0200)
commit9c3f75c29d2938bc3dd77a7733a11059ed2bc488
tree7cbd6aabc17a8fa259d244a992d034ccfd24e38c
parent628174990971e05277dc638876fc7f00052dbb8a
parent901f9c0a32985f48672fd68594111dc55d88a57a
Merge commit '901f9c0a32985f48672fd68594111dc55d88a57a'

* commit '901f9c0a32985f48672fd68594111dc55d88a57a':
  qtrle: Properly use AVFrame API

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/qtrleenc.c