Merge commit '95e2317ed85502dd8d96bcd9b12084dbfb8f9e8e'
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 20 Jul 2015 19:31:42 +0000 (21:31 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 20 Jul 2015 19:31:42 +0000 (21:31 +0200)
commit6497aab022bf791f43a22d1ef2171994ef8e8980
treefdb8bd4bd0967cae653c611ab111512111eca97f
parent16b68bd2ee5f36194b0bd9accc87a62a4b6048d2
parent95e2317ed85502dd8d96bcd9b12084dbfb8f9e8e
Merge commit '95e2317ed85502dd8d96bcd9b12084dbfb8f9e8e'

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

Conflicts:
libavcodec/roqvideoenc.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/roqvideoenc.c