Merge commit '1f008f34d5b2b5f6217521747e7acfe3efc0e666'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 1 Jan 2016 14:51:58 +0000 (15:51 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 1 Jan 2016 14:51:58 +0000 (15:51 +0100)
commit53448461a7720afab0d1f1234af79573fd2e020d
tree5fec5db11035224ce20ff992e5bd536e0574b4f7
parentb47111b6579fbe07b09bb360732b140ad6e870db
parent1f008f34d5b2b5f6217521747e7acfe3efc0e666
Merge commit '1f008f34d5b2b5f6217521747e7acfe3efc0e666'

* commit '1f008f34d5b2b5f6217521747e7acfe3efc0e666':
  rmenc: do not use AVCodecContext.frame_size

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