OSDN Git Service

Merge commit 'c3e5c47bdae2bb8219fea62d91b7455650b22c60'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 10 Oct 2015 07:58:42 +0000 (09:58 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 10 Oct 2015 07:58:42 +0000 (09:58 +0200)
commitc4e23ca8537701a38427f90b2dd72eb681d011d6
tree7ba222709190ff263ada4a33c9d6d9fd3fc80a98
parent80fd6225907d4f3e57a3c17944f5cf4edd1000cd
parentc3e5c47bdae2bb8219fea62d91b7455650b22c60
Merge commit 'c3e5c47bdae2bb8219fea62d91b7455650b22c60'

* commit 'c3e5c47bdae2bb8219fea62d91b7455650b22c60':
  libopenh264enc: Added max_nal_size option

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