[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Feb 28 22:39:54 2014 +0100| [d46c3b8171b30e757f1f80f88e5b8ceda9a48831] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  latm: Always reconfigure if no extradata was set previously

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

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