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)
* commit '9f1eccb97bf8894cb18b14f642500686505ef186':
  ff_parse_specific_params: do not use AVCodecContext.frame_size

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

Simple merge