Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Oct 2012 11:31:46 +0000 (13:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Oct 2012 11:42:58 +0000 (13:42 +0200)
commitf3b8096bc0e7df9e45db1023d6e6e7bff177d0c4
tree9b3c775ca329b0453593297d2bd7915ac88bb61e
parent42ee9f3981979880209a60d1ac30057fcfab6e53
parent0c03cc68386443f1e96ab6fb358220faf67cd5ff
Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

* commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff':
  mp3: exit on parsing error in mp_decode_frame
  rtmppkt: Avoid unescaped backslash in Doxygen comment
  fate-lavfi: replace sed/grep/cut combos with awk
  build: Plan 9 support

Conflicts:
configure
tests/lavfi-regression.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
compat/plan9/main.c
configure
doc/platform.texi
libavformat/os_support.h
libavformat/rtmppkt.h