Merge commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26'

* commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26':
  avio: fix pointer type mismatches in avio_enum_protocols()
  avserver: use socklen_t where appropriate
  udp: use socklen_t where appropriate
  network: use HAVE_THREADS instead of local hack
  af_channelmap: remove stray enum declaration
  buffersink: remove stray semicolon after function definition

Conflicts:
libavformat/avio.c

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

fate: make sure the global sws flags are set to be bitexact for scalenorm

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

fate: add a test for scale with variable input format.

lavfi/concat: implement unsafe mode.

lpc: check that lpc_type is valid in ff_lpc_calc_coefs

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

sws: rgb has no range, avoid random results if the user tries to mess with it anyway.

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

swr: use 64bit index/len for x86_64 mix

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

vf_showinfo: check return code of av_image_get_linesize()

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

swfenc: zero fifo after freeing

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

tak_parser: check ff_combine_frame() return code

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

lavf/showspectrum: fix unaligned rdft data.

riff: support 0xa100 TwoCC

fixes decoding of file "4790b7f1c44f98e35f3b806468fa615f5930a5b3.wav" from ticket #1856
(0xa100 = Comverse Infosys Ltd. G723 1)

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

msmpeg4dec: fix init code to not fail when called from 2 threads at the same time.

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

ff_h263_decode_init_vlc: fix order of operations to avoid failure with 2 threads

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

Port MPlayer fixes for coverity issues in libmpcodecs.

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

sws: loose the minimum dimension checks

A few quick tests show no fundamental problem with such diemnsions

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

sws: improve error messages

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

sws: fix extreem downscaling

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: fix tests for 2-arg math functions
  doc: git-howto: Clarify comment about pushing series of commits
  ivi_common: Drop unused function parameter from decode_band()
  cook: Remove some silly Doxygen comments
  cook: Remove senseless maybe_reformat_buffer32() function
  cook: cosmetics: Better names for joint_decode() function parameters
  cook: cosmetics: Better name for ccpl COOKSubpacket member
  doxygen: Add av_alloc_size to list of predefined macros
  doxygen: Drop some pointless entries from PREDEFINED macros list
  h263: avoid memcpys over array bound in motion vector caching for obmc

Conflicts:
configure
doc/git-howto.texi
libavcodec/cook.c

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

avio: fix pointer type mismatches in avio_enum_protocols()

Signed-off-by: Mans Rullgard <mans@mansr.com>

avserver: use socklen_t where appropriate

Various socket functions expect a pointer to socklen_t which is not
necessarily int.

Signed-off-by: Mans Rullgard <mans@mansr.com>

udp: use socklen_t where appropriate

getsockname() takes a pointer to socklen_t which is not necessarily
int.

Signed-off-by: Mans Rullgard <mans@mansr.com>

network: use HAVE_THREADS instead of local hack

HAVE_THREADS is set in config.h if pthreads or w32threads is
available, which presumably the proper condition here.

Also fixes undefined behaviour in preprocessor directives.

Signed-off-by: Mans Rullgard <mans@mansr.com>

af_channelmap: remove stray enum declaration

Signed-off-by: Mans Rullgard <mans@mansr.com>

buffersink: remove stray semicolon after function definition

Signed-off-by: Mans Rullgard <mans@mansr.com>

fix a compiling error with llvm-gcc

Move some #include in vda.h down to prevent libavutil headers
from interfering with system headers

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

ffmpeg: use av_rescale_delta() for audio stream copy

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

lavu: add more doxy to av_rescale_delta

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

Update my email address

Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

sws_getGaussianVec: check variance and quality

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

sws_allocVec: check length validity

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

ffmpeg: use av_rescale_delta() on the audio filter input

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

lavu: add av_rescale_delta()

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

ffmpeg: trivial simplification

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

mathemathics: update copyright years

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

lavu: add av_clip64()

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

configure: fix tests for 2-arg math functions

Signed-off-by: Mans Rullgard <mans@mansr.com>

lavf/srtenc: allow zero duration events.

This is useful when you want to remux events with zero (or too small)
durations.

lavc/srtenc: fix invalid read in case of SubRip.

Regression since 6057de19b. The ptr-2 is used to eat the \r\n and add
the position information on the timing line. This can't be done in case
of SubRip where the timing isn't present in the payload.

Note that we can't use yet the side data to transmit the position
information since the encode subtitles API is still using buffer+size
instead AVPacket as input.

doc: git-howto: Clarify comment about pushing series of commits

ivi_common: Drop unused function parameter from decode_band()

cook: Remove some silly Doxygen comments

cook: Remove senseless maybe_reformat_buffer32() function

cook: cosmetics: Better names for joint_decode() function parameters

cook: cosmetics: Better name for ccpl COOKSubpacket member

doxygen: Add av_alloc_size to list of predefined macros

This avoids Doxygen believing the attribute is the function name.

doxygen: Drop some pointless entries from PREDEFINED macros list

cws2fws: check fstat return code.

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

cws2fws: check lseek() return

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

cws2fws: check inflateInit return value

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

h263: avoid memcpys over array bound in motion vector caching for obmc

Fixes CID602232.

bit: check av_new_packet() return value

Fixes CID703626.

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

examples: fix doxy so they appear on the example page

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

rmdec: fix null derefercne

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

rmdec: use av_assert for audio_pkt_cnt

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: sanitise sparc vis check
  configure: recognise more sparc variants as --cpu argument
  build: Include HEADERS-yes in the HEADERS variable
  pcm: change references to raw to pcm
  ffv1: set the range coder state in decode_slice_header
  pcmdec: change default of channels parameter to 1

Conflicts:
libavformat/pcmdec.c

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

configure: sanitise sparc vis check

It is wrong to force -mcpu=ultrasparc when checking for vis.

Signed-off-by: Mans Rullgard <mans@mansr.com>

configure: recognise more sparc variants as --cpu argument

Signed-off-by: Mans Rullgard <mans@mansr.com>

caf muxer: write metadata

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

Merge commit '1b891d17c531e8a63c2974aab4bf997ce70746f3'

* commit '1b891d17c531e8a63c2974aab4bf997ce70746f3':
  avconv: fix bitrate report when writing to /dev/null
  avfilter: fix graphparser memleaks on error paths
  rawdec: remove ff_raw_read_header
  pcmdec: remove dependency from rawdec
  g722: refactor out of rawdec.c
  rawvideo: use a specific read_header

Conflicts:
ffmpeg.c
libavformat/Makefile
libavformat/rawdec.c

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

aacps: fix order of operands of ipdopd_reset().

With the current implementation this is purely cosmetic

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

aacps: loose self assignment

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

aacenc: replace scale factor warning by assert

The code would crash after printing the warning

Fixes CID717903, CID717904
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

aiffdec: read ID3 attached pictures

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

cafenc: make .long_name match demuxer

While here reindent .codec_tag .

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

tools: add ffescape utility

fraps: use meaningful error codes

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

lvfdec: cosmetics: fix identation

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

lavfi/showspectrum: add sliding mode.

lavd/lavfi: fix leak in case of failure

Jump to the common release code in case of failure.

lavfi/af_volumedetect: print stats in uninit().

If the stats are printed when request_frame on the input
returns EOF, then they are never printed if the filter is
not flushed, in particular when using the -t ffmpeg option.

Fix trac ticket #1727.

Restore installation of libavutil/lzo.h after 2a91ada8282f18d2807abee5188225bba1b19bda

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

lavfi/vf_fps: allow to set the rounding method.

By default, fps selects frames near PTS 0, 0.5, 1.5, 2.5, etc.
With round=down, it selects the frames near PTS 0, 1, 2, 3, etc.

ffserver: fix printf argument type

build: Include HEADERS-yes in the HEADERS variable

This makes sure the previously always installed public header
lzo.h is installed if the LZO functionality is enabled.

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

pcm: change references to raw to pcm

dsicinav: return proper error code in case of malloc failure

Fixes null pointer dereference.

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

dsicinav: return meaningful error code

While here remove redundant references in error message.

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

avconv: fix bitrate report when writing to /dev/null

avio_size() reports the filesize which returns 0 for /dev/null.
avio_tell() reports the current position.

Also handle errors from avio_tell().

avfilter: fix graphparser memleaks on error paths

Fixes CID700635, CID700636 and CID732274.

rawdec: remove ff_raw_read_header

It is not used anymore and is a kludge.

pcmdec: remove dependency from rawdec

The code shared is not actually shared with anything else.

g722: refactor out of rawdec.c

rawvideo: use a specific read_header

ff_raw_read_header is used only for this demuxer for video.

mxfenc: Write MultipleDescriptor ref in Preface

Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

aacdec: reorder multiuplications to make code safer against too large input values.

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avutil: Make LZO decoder code configure-time selectable
  avutil: Move memcpy_backptr() to mem.c
  configure: detect parisc64 automatically
  configure: detect ppc64 automatically
  configure: detect mips64 automatically
  configure: generalise 64-bit test
  smoothstreamingenc: Don't assume streams start from timestamp 0

Conflicts:
configure
libavutil/Makefile
libavutil/lzo.c
libavutil/lzo.h
libavutil/mem.c
libavutil/mem.h

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

avutil: Make LZO decoder code configure-time selectable

avutil: Move memcpy_backptr() to mem.c

The function is used elsewhere and does not belong with the LZO code.

mpegvideo: fix lowres on field pictures

Fixes Ticket1846

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

fate: reenable some recently lost audio tests

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

ffmpeg: fix null ptr deref in psnr printing code

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

roqaudioenc: remove dead code

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

qt-faststart: check return of ftello()

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

asfdec: fixed signedness in comparission

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

cmdutils: fix unclosed file on error

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

mov_probe: use correct variable

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

cmdutils: remove writes in never read variable

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

lavf/srtenc: set codec to subrip by default.

We don't have a text encoder yet, so this commit makes automatic
encoding working with srt output.

lavf/srtenc: simplify timing printing.