[FFmpeg-cvslog] Merge commit 'b0c2c097e422b9e10a7d856582f8321d28af821e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb  9 20:03:56 2014 +0100| [cf0e5b7fd4d18ac69f14adca529558edbb9baac3] | committer: Michael Niedermayer

Merge commit 'b0c2c097e422b9e10a7d856582f8321d28af821e'

* commit 'b0c2c097e422b9e10a7d856582f8321d28af821e':
  lavf: default .ogg audio to libvorbis if we can

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

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