Merge commit '79ae1e630b476889c251fc905687a3831b43ab5e'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 22 Nov 2015 17:41:27 +0000 (17:41 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 22 Nov 2015 17:41:27 +0000 (17:41 +0000)
commitfe20e34b139fde727d23c7f50c310e11567bcc5f
tree0bdca4ece274a425c0df95e1ed0b138a94dd8f96
parentad317c94c5fad00f97881263647e316344f0a81e
parent79ae1e630b476889c251fc905687a3831b43ab5e
Merge commit '79ae1e630b476889c251fc905687a3831b43ab5e'

* commit '79ae1e630b476889c251fc905687a3831b43ab5e':
  avcodec: Define side data type for fallback track

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h