Merge commit '936f0d98f864f9f6bb4f9e5458b78537e146bacd'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 31 Jan 2016 13:19:50 +0000 (13:19 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 31 Jan 2016 13:19:50 +0000 (13:19 +0000)
commit899e19f1776c607c126b291a7e0a614782f18f42
tree50792a530d56f35fff93eab04e03c2b8a6b8ad95
parent9938697c1c119a675759029ead74b91c529cdf2e
parent936f0d98f864f9f6bb4f9e5458b78537e146bacd
Merge commit '936f0d98f864f9f6bb4f9e5458b78537e146bacd'

* commit '936f0d98f864f9f6bb4f9e5458b78537e146bacd':
  lavc: Move rtp_payload_size to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/avcodec.h
libavcodec/libopenh264enc.c
libavcodec/libx264.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/options_table.h