[FFmpeg-cvslog] Merge commit '95e2317ed85502dd8d96bcd9b12084dbfb8f9e8e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Jul 20 21:31:42 2015 +0200| [6497aab022bf791f43a22d1ef2171994ef8e8980] | committer: Michael Niedermayer

Merge commit '95e2317ed85502dd8d96bcd9b12084dbfb8f9e8e'

* commit '95e2317ed85502dd8d96bcd9b12084dbfb8f9e8e':
  roqvideoenc: Drop unneeded initialization

Conflicts:
	libavcodec/roqvideoenc.c

Merged-by: Michael Niedermayer <michael at niedermayer.cc>

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