[FFmpeg-cvslog] Merge commit '76267ecc82e3018e1913a2483d5fc47d0949cbd8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 22 17:18:41 2013 +0100| [6d648dcfc9e30c9cf47ec7d9842e54cb1c9c1da8] | committer: Michael Niedermayer

Merge commit '76267ecc82e3018e1913a2483d5fc47d0949cbd8'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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