* dilaroga/master:
  vda: cosmetic.
  vda: removes useless doxygen command.
  vda: uses pthreads directly.
  vda: convert 3 byte NAL sizes to 4 byte.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes Ticket676
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Fixes ticket #895.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

Fixes trac issue #899.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

The passed argument is supposed to be the chapter/section name, rather
than the header/footer. Less confusing.

Possibly faster/cleaner.
Suggested-By: Clément Bœsch <ubitux@gmail.com>

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

* qatar/master: (29 commits)
  cabac: Move code only used within the CABAC test program into the test program.
  vp56: Drop unnecessary cabac.h #include.
  h264-test: Initialize AVCodecContext.av_class.
  build: Skip compiling network.h and rtsp.h if networking is not enabled.
  cosmetics: drop some pointless parentheses
  Disable annoying warning without changing behavior
  faq: Solutions for common problems with sample paths when running FATE.
  avcodec: attempt to clarify the CODEC_CAP_DELAY documentation
  avcodec: fix avcodec_encode_audio() documentation.
  FATE: xmv-demux test; exercise the XMV demuxer without decoding the perceptual codecs inside.
  vqf: recognize more metadata chunks
  FATE test: BMV demuxer and associated video and audio decoders.
  FATE: indeo4 video decoder test.
  FATE: update xxan-wc4 test to a sample with more code coverage.
  Change the recent h264_mp4toannexb bitstream filter test to output to an elementary stream rather than a program stream.
  g722enc: validate AVCodecContext.trellis
  g722enc: set frame_size, and also handle an odd number of input samples
  g722enc: split encoding into separate functions for trellis vs. no trellis
  mpegaudiodec: Use clearer pointer math
  tta: Fix returned error code at EOF
  ...

Conflicts:
	libavcodec/h264.c
	libavcodec/indeo3.c
	libavcodec/interplayvideo.c
	libavcodec/ivi_common.c
	libavcodec/libxvidff.c
	libavcodec/mpegvideo.c
	libavcodec/ppc/mpegvideo_altivec.c
	libavcodec/tta.c
	libavcodec/utils.c
	libavfilter/vsrc_buffer.c
	libavformat/Makefile
	tests/fate/indeo.mak
	tests/ref/acodec/g722
Merged-by: Michael Niedermayer <michaelni@gmx.at>

g723_1: Fix "libavcodec/g723_1.c:988:8: warning: assignment from incompatible pointer type [enabled by default]"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Fixes Ticket851
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes Ticket875
Compared to patch 1 this fixes a bright line at the right side.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Add -show_frames option to ffprobe.

Partially based on the work of Thomas Kuehnel <kuehnelth@googlemail.com>
for SOCIS 2011.

The wicked idea of creating a special "packets_and_frames" container for
structured formats (JSON and XML) comes from Clément.

This fixes a segfault on startup.

Also remove a commented-out and completely unused variable.

rtsp.h relies on network.h and the latter conditionally defines fallback OS
structures that rely on configure tests, which are only run if networking
is enabled.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>

This fixes various problems with getting stream info. For example playback of the
file of Ticket88. Multithreaded find_stream_info should be reenabled
once it works correctly
This partly reverts 212fd3a1Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

the previous documentation indicated how many bytes are read from the input,
not how many samples are read.

Code coverage:
libavformat/xmv.c: 3% -> 91%
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>

Do not create tags for non-char chunks.
Create readable tag for DSIZ chunk.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>

Code coverage:
libavcodec/bmv.c: 0% -> 75%
libavformat/bmv.c: 0% -> 85%
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>

Code coverage:
libavcodec/indeo4.c: 0% -> 78%
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>