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

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

Fixes CID733789, and others
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

jpeglsenc: favor av_freep() for saftey over av_free() when a variable is still accessible afterwards
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

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

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

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

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

* qatar/master:
  mlpdsp: adding missing file
  dsputil: split out mlp dsp function
  sh4: add required #include, fix build
  averror: make error values proper negative values
  build: do not use LIB as variable name
  build: whitespace cosmetics
  build: remove single-use variable THIS_LIB

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

* commit '4436f25a':
  build: remove references to unused EXTRAOBJS variable
  lavfi: convert input/ouput list compound literals to named objects
  fate: add h263 obmc vsynth tests
  avconv: remove bogus warning when using avconv -h without parameter
  averror: explicitly define AVERROR_* values
  flashsv: propagate inflateReset() errors
  indeo4/5: remove constant parameter num_bands from wavelet recomposition
  mxfdec: return error if no segments are available in mxf_get_sorted_table_segments
  Double motion vector range for HPEL interlaced picture in proper place

Conflicts:
	libavcodec/v210dec.h
	libavfilter/af_aformat.c
	libavfilter/af_amix.c
	libavfilter/af_asyncts.c
	libavfilter/af_channelmap.c
	libavfilter/af_join.c
	libavfilter/asrc_anullsrc.c
	libavfilter/buffersrc.c
	libavfilter/f_setpts.c
	libavfilter/f_settb.c
	libavfilter/fifo.c
	libavfilter/src_movie.c
	libavfilter/vf_ass.c
	libavfilter/vf_blackframe.c
	libavfilter/vf_boxblur.c
	libavfilter/vf_delogo.c
	libavfilter/vf_drawbox.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_fieldorder.c
	libavfilter/vf_fps.c
	libavfilter/vf_hflip.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c
	libavfilter/vf_select.c
	libavfilter/vf_transpose.c
	libavfilter/vf_yadif.c
	libavfilter/vsrc_testsrc.c
	libavformat/mxfdec.c
	libavutil/error.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'eb657ece':
  vc1dec: Set opposite to the correct value for 1REF field pictures
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7cc3c4e1':
  vc1dec: Invoke edge emulation regardless of MV precision for 1-MV chroma
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '88058d9a':
  vc1dec: Set chroma reference field from REFFIELD for 1REF field pictures
  segment: support applehttp style list

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

* commit 'b522000e':
  avio: introduce avio_closep
  mpegtsenc: set muxing type notification to verbose
  vc1dec: Use correct spelling of "opposite"
  a64multienc: change mc_frame_counter to unsigned
  arm: call arm-specific rv34dsp init functions under if (ARCH_ARM)
  svq1: Drop a bunch of useless parentheses
  parseutils-test: do not print numerical error codes
  svq1: K&R formatting cosmetics

Conflicts:
	doc/APIchanges
	libavcodec/svq1dec.c
	libavcodec/svq1enc.c
	libavformat/version.h
	libavutil/parseutils.c
	tests/ref/fate/parseutils
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

This reverts commit 396648cc.

The commit made impossible to build against libflite if libasound is not
available (e.g. on Windows). Thus remove the -lasound flag. In case of
libflite static linking the workaround is to enable
--extra-ldflags=-lasound (or disable the ALSA output device in libflite).

libflite depends on libasound. Fix a linking failure when linking against
a static version of libflite.

Reported-by: Vladimir Kraljevic

Protects against overreads in input buffer.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

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

This condition cannot happen.

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

Instead print a warning.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

This makes no change to the way the code functions, but should make
it easier for static analyzers to see the valid range for i
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

This test only make sure that the idet filter does not crash.
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
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 stupid mistake in 25227c3a.

This was part of a ghastly hack that is long since gone.
Signed-off-by: Mans Rullgard <mans@mansr.com>

The Microsoft linker uses the LIB environment variable which
clashes with a make variable of the same name.
Signed-off-by: Mans Rullgard <mans@mansr.com>

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

Replace the single use of THIS_LIB with its value.
Signed-off-by: Mans Rullgard <mans@mansr.com>

Mostly based on 73ad355d by Michael Niedermayer.
Fixes ticket #606.