Merge commit '76267ecc82e3018e1913a2483d5fc47d0949cbd8'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Nov 2013 16:18:41 +0000 (17:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Nov 2013 16:18:52 +0000 (17:18 +0100)
commit6d648dcfc9e30c9cf47ec7d9842e54cb1c9c1da8
treeda3e51458283183402484308d9f89e6399c454a5
parent51268aaed245f6cc7252e5e3692e00e13963d601
parent76267ecc82e3018e1913a2483d5fc47d0949cbd8
Merge commit '76267ecc82e3018e1913a2483d5fc47d0949cbd8'

* commit '76267ecc82e3018e1913a2483d5fc47d0949cbd8':
  http: Remove an unrelated and mistakenly set AVOption unit name

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/http.c