* commit '21732063':
  movenc: K&R formatting cosmetics

Conflicts:
	libavformat/movenc.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '38e9585d':
  Makefile: Remove stray tabs
  vp8: Wait for prev_frame to parse segment_map before reading it
  yuv4mpeg: Correctly round chroma up for odd luma sizes
  rmdec: Use the AVIOContext given as parameter in rm_read_metadata()
  avio: Handle AVERROR_EOF in the same way as the return value 0

Conflicts:
	libavformat/rmdec.c
	libavformat/yuv4mpeg.c

No change as all the commits where already in before
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

This fixes speex in rtmp
Fixes Ticket2409

the nellymoser in flv case actually needs larger analyzeduration. The code
previously just failed to calculate the duration

If this causes any problems, like premature analyze/probe end, please report!
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Signed-off-by: NPaul B Mahol <onemda@gmail.com>

Signed-off-by: NPaul B Mahol <onemda@gmail.com>

Signed-off-by: NPaul B Mahol <onemda@gmail.com>

Signed-off-by: NPaul B Mahol <onemda@gmail.com>

Signed-off-by: NMartin Storsjö <martin@martin.st>

Signed-off-by: NMartin Storsjö <martin@martin.st>

This fixes occasional failures of vp8-test-vector-010 with frame-level
multithreading enabled.
Signed-off-by: NMartin Storsjö <martin@martin.st>

Signed-off-by: NMartin Storsjö <martin@martin.st>

This fixes crashes when playing back certain RealRTSP streams.

When invoked from the RTP depacketizer, the full realmedia
demuxer isn't invoked, but only certain functions from it, where
a separate AVIOContext is passed in as parameter (for the buffer
containing the data to parse). The functions called from within
those entry points should only be using that parameter, not
s->pb. In the depacketizer case, s is the RTSP context, where ->pb
is null.

Cc: libav-stable@libav.org
Signed-off-by: NMartin Storsjö <martin@martin.st>

This makes sure the ffurl_read_complete function actually
returns the number of bytes read, as the documentation of the
function says, even if the underlying protocol uses AVERROR_EOF
instead of 0.
Signed-off-by: NMartin Storsjö <martin@martin.st>

A sid 0 would be mismatched to the attachment.

Prevent NULL pointer dereference.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Signed-off-by: NPaul B Mahol <onemda@gmail.com>

Fixes Ticket2682
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Fixes long delay with some hardware generated h264 in ts
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

This fixes hyothetical bugs with parsing of elements after the TOC
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Fixes hypothetical parsing bug with -usetoc 0
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

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

* qatar/master:
  wtv: Mark attachment with a negative stream id

Conflicts:
	libavformat/wtv.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'a4baf96a':
  avprobe: rename the prettyprint structures
  tools: Wording and formatting cosmetics

Conflicts:
	avprobe.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '65166329':
  tests: Only run noproxy test if networking is enabled
  fifo: K&R formatting cosmetics

Conflicts:
	libavformat/Makefile
	libavutil/fifo.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '4e7f0b08':
  kmvc: Clip pixel position to valid range

The added clip should make no difference, there are already checks for
the index.
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '8f689770':
  kmvc: use fixed sized arrays in the context
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

Fixes Ticket2757
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

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

should fix ticket2755
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

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

Based on description by James Almer and the xiph wiki
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Fixes finding the duration for nut files that are truncated
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

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

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Avoid some boilerplate code to dynamically allocate and then free the
buffers.

Signed-off-by: NPaul B Mahol <onemda@gmail.com>

Signed-off-by: NPaul B Mahol <onemda@gmail.com>