Merge commit '447b5b278c689b21bbb7b5747c8773145cbd9448'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 27 Oct 2015 13:04:47 +0000 (14:04 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 27 Oct 2015 13:04:47 +0000 (14:04 +0100)
* commit '447b5b278c689b21bbb7b5747c8773145cbd9448':
  mpegvideo_enc: Fix encoding videos with less frames than the delay of the encoder

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

Simple merge