Merge commit 'a0b7e289075dccf223b7f407790d8a86fc5d77e8'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Jan 2013 12:01:54 +0000 (13:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Jan 2013 12:01:54 +0000 (13:01 +0100)
commite1cf1a9c89dbb3b867c50421cf543221a4d223f9
treeacbed33573df63b7d86f785bb44d875326f59420
parentd0b450457b3aeb8c234b0b0a987db55d3485326b
parenta0b7e289075dccf223b7f407790d8a86fc5d77e8
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@gmx.at>
libavcodec/allcodecs.c
libavdevice/alldevices.c
libavformat/allformats.c
libavformat/aviobuf.c