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)
* 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>
1  2 
libavcodec/allcodecs.c
libavdevice/alldevices.c
libavformat/allformats.c
libavformat/aviobuf.c

Simple merge
Simple merge
Simple merge
@@@ -483,8 -452,8 +483,8 @@@ int avio_read(AVIOContext *s, unsigned 
          len = s->buf_end - s->buf_ptr;
          if (len > size)
              len = size;
-         if (len == 0) {
+         if (len == 0 || s->write_flag) {
 -            if(size > s->buffer_size && !s->update_checksum){
 +            if((s->direct || size > s->buffer_size) && !s->update_checksum){
                  if(s->read_packet)
                      len = s->read_packet(s->opaque, buf, size);
                  if (len <= 0) {