[FFmpeg-cvslog] Merge commit 'f22aa6b841dc54fa1dd804303885b1e230a5f629'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct 21 22:06:46 2014 +0200| [1922357e5a05eb5a3e6859097264224d8878fa9c] | committer: Michael Niedermayer

Merge commit 'f22aa6b841dc54fa1dd804303885b1e230a5f629'

* commit 'f22aa6b841dc54fa1dd804303885b1e230a5f629':
  flvdec: avoid unitialized use of a struct member

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

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