This reverts commit 31444400.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* lukaszmluki/master:
  lavd/avdevice: always free detected devices on error
  lavf/http: return error from seek on invalid whence
  lavf/http: return error on seeking to negative postion
  lavf/avio: fix ffurl_alloc error checks
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

ffurl_alloc doc says it returns >= 0 in case of success.
avio treats non-zero as errors.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

Some http servers send an ICY stream in combination with chunked
transfer encoding. This case was handled incorrectly by the ICY code:
instead of handling chunked encoding before anything ICY related, both
were mixed.

Fix this by separating the ICY code from normal http reading. Move the
normal http reading to a new function http_read_stream(), while
http_read() handles ICY on top of http_read_stream().

The server identified itself as: cloudflare-nginx
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

doc/APIchanges: fill in missing version for "2013-11-14 - 31c09b76 / 728c4658 - lavc 55.26.0 - vdpau.h"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  arm: hpeldsp: prevent overreads in armv6 asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3741aa37':
  x86: cabac: Use correct #includes to make header compile standalone
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Based on a patch by Russel King <rmk+libav@arm.linux.org.uk>

Bug-Id: 646
CC: libav-stable@libav.org

emms is a rather slow operation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

c3390fd5 made use of the DSP function
but did not complement it with a call to emms, which is done here before
computations involving floats are performed.

Fixes ticket #3429, which affected MMX/MMXExt machines.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  avfilter: Add missing emms_c when needed
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5ddc9f50':
  configure: enable PIC on s390(x)
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'eeaf4f3b':
  av_vdpau_get_profile: mask out H.264 intra profile flag
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Arch specific calls should have an emms_c following to keep the cpu
state consistent.

Reported-By: wm4
CC: libav-stable@libav.org

The s390 architecture requires shared libraries to be built in PIC mode.
Otherwise applications will get wrong relocations at run-time, leading
to confusing segmentation faults.

CC: libav-stable@libav.org

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

If set, and if TCP is available as RTSP RTP transport, then TCP will be
tried first as RTP transport.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Janne Grunau <janne-libav@jannau.net>

Should fix compilation failures with --disable-yasm on some compilers
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3407172b':
  avienc: K&R formatting cosmetics

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

* commit '4c41a7a1':
  vf_frei0r: fix missing end of line character

Conflicts:
	libavfilter/vf_frei0r.c

No change as the token parsing change was not merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a18ef7a7':
  doc: fix a couple of typos in frame.h

Conflicts:
	libavutil/frame.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Diego Biurrun <diego@biurrun.de>

Error introduced in 61b323ce.

Allowing HEVC video using TS stream type 0x24
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  put_bits: Remove unused includes

Conflicts:
	libavcodec/put_bits.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5397386e':
  mathops: move macro to the only place it is used
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '61b323ce':
  vf_frei0r: refactor library loading from env variable

Conflicts:
	configure
	libavfilter/vf_frei0r.c

Not merged, we use av_strtok() which leads to simpler code
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4e0be9c8':
  vf_frei0r: prevent a segfault when filter parameters are not set
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8accddeb':
  vf_frei0r: adjust error messages

Conflicts:
	libavfilter/vf_frei0r.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This requires adding includes to other files that relied on these being
included implicitly.