Merge commit '69a68593ce5684409c3c4dd9a901bfd8b16925b1'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 2 Jan 2016 12:20:13 +0000 (13:20 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 2 Jan 2016 12:20:13 +0000 (13:20 +0100)
commit95a2b883e36d3499c6bf620c65ac9d21fa2bd808
treea7e4297b5e5e88db35d355d87e0d9f9fdec7d4d3
parent8a04ddeb4704e1f3c7237d48d95edae08a3193fe
parent69a68593ce5684409c3c4dd9a901bfd8b16925b1
Merge commit '69a68593ce5684409c3c4dd9a901bfd8b16925b1'

* commit '69a68593ce5684409c3c4dd9a901bfd8b16925b1':
  Remove stray line breaks from avpriv_{report_missing_feature|request_samples}

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/exr.c
libavcodec/ivi.c
libavformat/lxfdec.c
libavformat/rtpdec_hevc.c