Merge commit '2f9b652e8c646eabef74a6742f0d7d4c9118fd0e'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 5 Sep 2015 15:44:55 +0000 (17:44 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 5 Sep 2015 15:44:55 +0000 (17:44 +0200)
commitf940931995d038c9b0527f14b64953101865708a
treeaeb89d3edbaa95728f1ebd0acc8719560d83ff55
parenta9915268327b097bba84a07f68968d8c07f4b549
parent2f9b652e8c646eabef74a6742f0d7d4c9118fd0e
Merge commit '2f9b652e8c646eabef74a6742f0d7d4c9118fd0e'

* commit '2f9b652e8c646eabef74a6742f0d7d4c9118fd0e':
  lavu: Drop deprecated context size variables

These variables had been previously un-deprecated in ffmpeg, not removed.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavutil/version.h