[FFmpeg-cvslog] Merge commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Tue Sep  8 15:43:03 2015 +0200| [151aa2ebff514a9d150a2d3a7b92be1dcc46df36] | committer: Hendrik Leppkes

Merge commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba'

* commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba':
  lavu: Drop the {minus,plus}1 suffix from AVComponentDescriptor fields

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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