Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ARM: ac3: update ff_ac3_extract_exponents_neon per 8b7b2d6
  ARM: NEON optimised vector_clip_int32()
  swscale: disable full_chroma_int when converting to non-24/32bpp RGB.
  suggest to use av_get_bytes_per_sample() in av_get_bits_per_sample_format() doxy
  ffmpeg: use av_get_bytes_per_sample() in place of av_get_bits_per_sample_fmt()
  put_bits: remove ALT_BITSTREAM_WRITER
  put_bits: always use intreadwrite.h macros
  libavformat: Add an example how to use the metadata API
  doxygen: Prefer member groups over grouping into modules
  doxygen: be more permissive when searching for API examples
  avformat: doxify the Metadata API
  lavf: restore old behavior for custom AVIOContex with an AVFMT_NOFILE format.
  lavf: use the correct pointer in av_open_input_stream().
  avidec: infer absolute vs relative index from first packet

Conflicts:
	libavformat/Makefile
	libavformat/avidec.c

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

diff --cc Doxyfile
Simple merge

diff --cc ffmpeg.c
Simple merge

diff --cc libavcodec/aac.h
Simple merge

diff --cc libavcodec/ac3.h
Simple merge

diff --cc libavcodec/ac3dec.h
index 377e515,aed8743..4b3e7e3
--- 1/libavcodec/ac3dec.h
--- 2/libavcodec/ac3dec.h
+++ b/libavcodec/ac3dec.h
@@@ -68,8 -65,9 +68,8 @@@
  typedef struct {
      AVCodecContext *avctx;                  ///< parent context
      GetBitContext gbc;                      ///< bitstream reader
 -    uint8_t *input_buffer;                  ///< temp buffer to prevent overread
  
- ///@defgroup bsi bit stream information
+ ///@name Bit stream information
  ///@{
      int frame_type;                         ///< frame type                             (strmtyp)
      int substreamid;                        ///< substream identification

diff --cc libavcodec/amrnbdec.c
Simple merge

diff --cc libavcodec/apedec.c
Simple merge

diff --cc libavcodec/arm/dsputil_init_neon.c
Simple merge

diff --cc libavcodec/arm/dsputil_neon.S
Simple merge

diff --cc libavcodec/ass.h
Simple merge

diff --cc libavcodec/avcodec.h
Simple merge

diff --cc libavcodec/bitstream.c
Simple merge

diff --cc libavcodec/h264.h
Simple merge

diff --cc libavcodec/mpegvideo_enc.c
Simple merge

diff --cc libavcodec/put_bits.h
Simple merge

diff --cc libavcodec/qcelpdata.h
Simple merge

diff --cc libavcodec/rv34.c
Simple merge

diff --cc libavcodec/rv40data.h
Simple merge

diff --cc libavcodec/sbr.h
Simple merge

diff --cc libavcodec/tableprint.h
Simple merge

diff --cc libavcodec/vc1.c
Simple merge

diff --cc libavcodec/vc1dec.c
Simple merge

diff --cc libavcodec/wmavoice.c
Simple merge

diff --cc libavformat/Makefile
index 6d7a342,a20db26..27a6a9b
--- 1/libavformat/Makefile
--- 2/libavformat/Makefile
+++ b/libavformat/Makefile
@@@ -338,9 -331,9 +338,10 @@@ OBJS-$(CONFIG_TCP_PROTOCOL
  OBJS-$(CONFIG_UDP_PROTOCOL)              += udp.o
  
  # libavdevice dependencies
 +OBJS-$(CONFIG_ALSA_INDEV)                += timefilter.o
  OBJS-$(CONFIG_JACK_INDEV)                += timefilter.o
  
 -EXAMPLES  = metadata output
++EXAMPLES  = metadata
  TESTPROGS = timefilter
  
  include $(SRC_PATH)/subdir.mak

diff --cc libavformat/avformat.h
index 6069f19,8561a50..558f3c5
--- 1/libavformat/avformat.h
--- 2/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@@ -48,10 -48,11 +48,11 @@@ const char *avformat_license(void)
  struct AVFormatContext;
  
  
- /*
-  * Public Metadata API.
+ /**
+  * @defgroup metadata_api Public Metadata API
+  * @{
   * The metadata API allows libavformat to export metadata tags to a client
 - * application using a sequence of key/value pairs. Like all strings in Libav,
 + * application using a sequence of key/value pairs. Like all strings in FFmpeg,
   * metadata must be stored as UTF-8 encoded Unicode. Note that metadata
   * exported by demuxers isn't checked to be valid UTF-8 in most cases.
   * Important concepts to keep in mind:

diff --cc libavformat/avidec.c
index 366914a,871da0b..8e9cd07
--- 1/libavformat/avidec.c
--- 2/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@@ -1205,10 -1167,15 +1215,15 @@@ static int avi_read_idx1(AVFormatContex
          st = s->streams[index];
          ast = st->priv_data;
  
- #if defined(DEBUG_SEEK)
-         av_log(s, AV_LOG_DEBUG, "%d cum_len=%"PRId64"\n", len, ast->cum_len);
- #endif
+         if(first_packet && first_packet_pos && len) {
+             data_offset = first_packet_pos - pos;
+             first_packet = 0;
+         }
+         pos += data_offset;
+ 
+         av_dlog(s, "%d cum_len=%"PRId64"\n", len, ast->cum_len);
+ 
 -        if(pb->eof_reached)
 +        if(url_feof(pb))
              return -1;
  
          if(last_pos == pos)

diff --cc libavformat/avio.h
Simple merge

diff --cc libavformat/rtmppkt.h
Simple merge

diff --cc libavformat/utils.c
Simple merge

diff --cc libavutil/lzo.h
Simple merge