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)
* commit '95e2317ed85502dd8d96bcd9b12084dbfb8f9e8e':
  roqvideoenc: Drop unneeded initialization

Conflicts:
libavcodec/roqvideoenc.c

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

Simple merge