[FFmpeg-cvslog] Merge commit '79ae1e630b476889c251fc905687a3831b43ab5e'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Sun Nov 22 17:41:27 2015 +0000| [fe20e34b139fde727d23c7f50c310e11567bcc5f] | committer: Derek Buitenhuis

Merge commit '79ae1e630b476889c251fc905687a3831b43ab5e'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fe20e34b139fde727d23c7f50c310e11567bcc5f
---