[FFmpeg-cvslog] Merge commit 'a0b7e289075dccf223b7f407790d8a86fc5d77e8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jan  4 13:01:54 2013 +0100| [e1cf1a9c89dbb3b867c50421cf543221a4d223f9] | committer: Michael Niedermayer

Merge commit 'a0b7e289075dccf223b7f407790d8a86fc5d77e8'

* commit 'a0b7e289075dccf223b7f407790d8a86fc5d77e8':
  aviobuf: Partial support for reading in read/write contexts
  build: Avoid detecting bogus components named 'x'

Conflicts:
	libavcodec/allcodecs.c
	libavdevice/alldevices.c
	libavformat/allformats.c
	libavformat/aviobuf.c

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

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