Merge commit '9f1eccb97bf8894cb18b14f642500686505ef186'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 1 Jan 2016 14:52:18 +0000 (15:52 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 1 Jan 2016 14:52:18 +0000 (15:52 +0100)
commit29e6606e9b42aa811be995e2fcdea4806911bc9f
treeb3ac08cfc0763b40551128ecf82c9714f2ab61be
parent53448461a7720afab0d1f1234af79573fd2e020d
parent9f1eccb97bf8894cb18b14f642500686505ef186
Merge commit '9f1eccb97bf8894cb18b14f642500686505ef186'

* commit '9f1eccb97bf8894cb18b14f642500686505ef186':
  ff_parse_specific_params: do not use AVCodecContext.frame_size

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