Merge commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95'

* commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95':
  avformat: Fix references to the removed function av_write_header in comments
  changelog: Mention the MSVC DLL support
  fate: add dependencies for misc microsoft codecs
  fate-twinvq: add dependencies
  fate-mpc: add dependencies
  fate-indeo: add dependencies
  fate-als: add dependencies
  fate: dependencies for demux tests

Conflicts:
Changelog
tests/Makefile
tests/fate/demux.mak
tests/fate/microsoft.mak
tests/fate/mpc.mak
tests/fate/vqf.mak

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

Merge commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72'

* commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72':
  fate: add a dependency helper macro
  Add support for building shared libraries with MSVC
  avcodec: Rename avpriv_frame_rate_tab to ff_mpeg12_frame_rate_tab
  gxf: Add a local copy of the relevant parts of the frame rate table
  configure: Split out msvc as a separate target OS
  aviobuf: Remove a senseless ifdef in avio_seek

Conflicts:
configure
libavcodec/dirac.c
libavcodec/mpeg12data.h
libavcodec/mpeg12enc.c

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

tiffenc: fix integer overflow

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

roqvideodec: replace dead code by assert

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

roqaudioenc: Fix crash with very small roq files

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

lavc/tta: do not overwrite bits_per_coded_sample

It is supposed to be set in libavformat only.

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

kmvc: use meaningful error codes

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

xxan: return more meaningful error codes

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

lavc/yop: remove redudant YOP in av_log() messages

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

jvdec: use more meaningful error code

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

idcinvideo: if decoding fails return error

Previously if frame decoding failed it would be
silently reported as valid frame.

The fate ref is updated because sample have
truncated last video packet.

While here return meaningful error codes.

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

lavc/c93: use meaningful error codes

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

motionpixels/mp_decode_frame_helper: assert that the first pixel doesnt reuse the last.

reusing the last would use uninitialized data, this should be
impossible currently, but better to check by assert.

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

mlp_parser: print error when ff_combine_frame() fails to add the current buffer

Fixes part of CID602338
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavc: add raw text subtitles decoder.

ff_convert_matrix: fix integer overflow

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

mpegvideoenc: check return value of ff_MPV_frame_start()

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

lzwenc: change assert to av_assert

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

bmv: remove unreachable default case

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

indeo4: prevent printing uninitialized variable

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

dv: change assert(a2 < 4) to av_assert()

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

riff: retry reading metadata without padding if it fails with

Fixes Ticket1821

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

riff: dont discard truncated metadata

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat: Fix references to the removed function av_write_header in comments

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

changelog: Mention the MSVC DLL support

Also retroactively add a changelog entry to the 9beta1 list
for general MSVC support, which was present there already.

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

fate: add dependencies for misc microsoft codecs

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

fate: add a dependency helper macro

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

fate-twinvq: add dependencies

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

fate-mpc: add dependencies

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

fate-indeo: add dependencies

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

fate-als: add dependencies

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

fate: dependencies for demux tests

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

Add support for building shared libraries with MSVC

This requires the makedef perl script by Derek, from the
c89-to-c99 repo. That scripts produces a .def file, listing
the symbols to be exported, based on the gcc version scripts
and the built object files.

To properly load non-function symbols from DLL files, the
data symbol declarations need to have the attribute
__declspec(dllimport) when building the calling code. (On mingw,
the linker can fix this up automatically, which is why it has not
been an issue so far. If this attribute is omitted, linking
actually succeeds, but reads from the table will not produce the
desired results at runtime.)

MSVC seems to manage to link DLLs (and run properly) even if
this attribute is present while building the library itself
(which normally isn't recommended) - other object files in the
same library manage to link to the symbol (with a small warning
at link time, like "warning LNK4049: locally defined symbol
_avpriv_mpa_bitrate_tab imported" - it doesn't seem to be possible
to squelch this warning), and the definition of the tables
themselves produce a warning that can be squelched ("warning C4273:
'avpriv_mpa_bitrate_tab' : inconsistent dll linkage, see previous
definition of 'avpriv_mpa_bitrate_tab').

In this setup, mingw isn't able to link object files that refer to
data symbols with __declspec(dllimport) without those symbols
actually being linked via a DLL (linking avcodec.dll ends up with
errors like "undefined reference to `__imp__avpriv_mpa_freq_tab'").
The dllimport declspec isn't needed at all in mingw, so we simply
choose not to declare it for other compilers than MSVC that requires
it. (If ICL support later requires it, the condition can be extended
later to include both of them.)

This also implies that code that is built to link to a certain
library as a DLL can't link to the same library as a static library.
Therefore, we only allow building either static or shared but not
both at the same time. (That is, static libraries as such can be,
and actually are, built - this is used for linking the test tools to
internal symbols in the libraries - but e.g. libavformat built to
link to libavcodec as a DLL cannot link statically to libavcodec.)

Also, linking to DLLs is slightly different from linking to shared
libraries on other platforms. DLLs use a thing called import
libraries, which is basically a stub library allowing the linker
to know which symbols exist in the DLL and what name the DLL will
have at runtime.

In mingw/gcc, the import library is usually named libfoo.dll.a,
which goes next to a static library named libfoo.a. This allows
gcc to pick the dynamic one, if available, from the normal -lfoo
switches, just as it does for libfoo.a vs libfoo.so on Unix. On
MSVC however, you need to literally specify the name of the import
library instead of the static library.

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

avcodec: Rename avpriv_frame_rate_tab to ff_mpeg12_frame_rate_tab

This table doesn't need to be shared with libavformat any longer.
Add mpeg12 to the name to make it less ambiguous, while renaming it.

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

gxf: Add a local copy of the relevant parts of the frame rate table

This avoids having to share this table across the library
boundaries.

This shared table used to be problematic, if always declaring
all exported data symbols with the dllimport attribute (even
while building that same library), since it needs to be a
link-time constant when it is used in AVCodec declarations
(in mpeg12enc.c).

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

configure: Split out msvc as a separate target OS

The name mingw32 as target OS is both misleading, and very little
of the target OS specific settings actually match.

Since the target OS default is set based on uname, the default
(which on MSYS is set to mingw) is overridden by --toolchain=msvc.

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mips64: mark hi/lo registers clobbered in MAC64/MLS64 macros
  fate: list lavfi tests in a makefile

Conflicts:
configure
tests/Makefile

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

Merge commit '36ac9a16a19a365ce58cc871484c20cffe9b6401'

* commit '36ac9a16a19a365ce58cc871484c20cffe9b6401':
  fate: dependencies for seek tests
  fate: handle lavf test dependencies entirely in make

Conflicts:
configure
tests/Makefile

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

fate: dependencies for ffmpeg vsynth tests

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

fate: dependencies for ffmpeg acodec tests

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

Merge commit '292d1e78743855404c7d07e3e7cb3f9c9ae6275b'

* commit '292d1e78743855404c7d07e3e7cb3f9c9ae6275b':
  fate: dependencies for acodec tests
  fate: dependencies for vsynth tests
  fate: add macros useful for conditionally enabling things
  libmp3lame: resize the output buffer if needed

Conflicts:
tests/fate/acodec.mak
tests/fate/vcodec.mak

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

cache: check lseek() return

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

aviobuf: Remove a senseless ifdef in avio_seek

This seemed to assume that one never used writing avio unless
muxers or networking was enabled.

This ifdef is a remnant since 8fa641f8.

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

cmdutils: add missing check for ftell() return

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

mips64: mark hi/lo registers clobbered in MAC64/MLS64 macros

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

fate: dependencies for seek tests

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

fate: dependencies for acodec tests

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

fate: list lavfi tests in a makefile

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

fate: handle lavf test dependencies entirely in make

This makes the lavf tests depend on all codecs and formats they use.

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

fate: dependencies for vsynth tests

This makes the vsynth tests run only if the required codecs and
formats are enabled.

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

fate: add macros useful for conditionally enabling things

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

configure: do not quote arguments passed to filter{,_out} in check_ld.

This fixes the following error:
./configure: eval: line 417: syntax error near unexpected token `-lcdio_cdda'
[...]
Broken by 66a1ccd74 when doing, e.g., ./configure --enable-gpl --enable-libcdio.

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

cmdutils: remove unneeded null check

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

examples/muxing: merge add_audio_stream() and add_video_stream()

Factorize.

examples/muxing: check on frame

Fix crash in case frame is not defined (e.g. with muxing out.wav).

examples/muxing: fix bogus setting of st->id

examples/muxing: remove misleading comment about pending API change

The API was never changed since 2003. Replace with a comment about the
performed operation.

examples/muxing: remove video_outbuf unused and useless code

lavfi/avf_concat: fix invalid exclusive test.

The invalid test did not cause any actual problem since
the first branch is only possible with bogus filters.

Fix coverity issue CID 733850.

tiff: run strlen() after setting the pointer

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

ffmdec: check av_new_packet() return value

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

ffmdec: fix hypothetical overflows

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

ffm_read_write_index: check lseek return code

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

ffm_write_write_index: check lseek() return code

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

ffm_seek: fix division by zero

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

libavfilter/lavfutils: remove useless NULL check on format context

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

libavfilter/lavfutils: remove useless NULL check on codec context

The code would crash before if it was NULL

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

mov_probe: fix integer overflows

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

idcinvideo: remove redundant "  id CIN Video: " from av_log()

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

libmp3lame: resize the output buffer if needed

The LAME API documentation for the required buffer size refers to the size for
a single encode call. However, we store multiple frames in the same output
buffer but only read 1 frame at a time out of it. As a result, the buffer size
given in lame_encode_buffer() is actually smaller than what it should be.
Since we do not know how many frames it will end up buffering, it is best to
just reallocate if needed.

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Add support for Tilera processors
  wavdec: check size before reading the data, not after.

Conflicts:
configure

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

Merge commit '79922d7237aba2b8c6abbd2e06a0c08e4f498ad4'

* commit '79922d7237aba2b8c6abbd2e06a0c08e4f498ad4':
  wav: do not fail on empty INFO tags

Conflicts:
libavformat/wavdec.c

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

Merge commit '31c54711cc3f1484af101d629bbb805820d37ad1'

* commit '31c54711cc3f1484af101d629bbb805820d37ad1':
  lavf: split wav muxer and demuxer into separate files.

Conflicts:
libavformat/wavdec.c

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

Merge commit '58b619c8a226cc4564ad5af291bc99a04f89ee56'

* commit '58b619c8a226cc4564ad5af291bc99a04f89ee56':
  wav muxer: write metadata

Conflicts:
Changelog
libavformat/version.h

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

Merge commit '0bca0283ccded5e32da143a462168ad1988a58fd'

* commit '0bca0283ccded5e32da143a462168ad1988a58fd':
  riff: do not write empty INFO tags

Conflicts:
tests/ref/fate/vsynth1-cljr
tests/ref/fate/vsynth1-ffvhuff
tests/ref/fate/vsynth1-h261
tests/ref/fate/vsynth1-h263
tests/ref/fate/vsynth1-h263-obmc
tests/ref/fate/vsynth1-h263p
tests/ref/fate/vsynth1-huffyuv
tests/ref/fate/vsynth1-jpegls
tests/ref/fate/vsynth1-mjpeg
tests/ref/fate/vsynth1-mpeg4-adap
tests/ref/fate/vsynth1-mpeg4-adv
tests/ref/fate/vsynth1-mpeg4-error
tests/ref/fate/vsynth1-mpeg4-nr
tests/ref/fate/vsynth1-mpeg4-qpel
tests/ref/fate/vsynth1-mpeg4-qprd
tests/ref/fate/vsynth1-mpeg4-rc
tests/ref/fate/vsynth1-mpeg4-thread
tests/ref/fate/vsynth1-msmpeg4
tests/ref/fate/vsynth1-msmpeg4v2
tests/ref/fate/vsynth1-rgb
tests/ref/fate/vsynth1-wmv1
tests/ref/fate/vsynth1-wmv2
tests/ref/fate/vsynth1-yuv
tests/ref/fate/vsynth2-cljr
tests/ref/fate/vsynth2-ffvhuff
tests/ref/fate/vsynth2-h261
tests/ref/fate/vsynth2-h263
tests/ref/fate/vsynth2-h263-obmc
tests/ref/fate/vsynth2-h263p
tests/ref/fate/vsynth2-huffyuv
tests/ref/fate/vsynth2-jpegls
tests/ref/fate/vsynth2-mjpeg
tests/ref/fate/vsynth2-mpeg4-adap
tests/ref/fate/vsynth2-mpeg4-error
tests/ref/fate/vsynth2-mpeg4-nr
tests/ref/fate/vsynth2-mpeg4-qpel
tests/ref/fate/vsynth2-mpeg4-qprd
tests/ref/fate/vsynth2-mpeg4-rc
tests/ref/fate/vsynth2-mpeg4-thread
tests/ref/fate/vsynth2-msmpeg4
tests/ref/fate/vsynth2-msmpeg4v2
tests/ref/fate/vsynth2-rgb
tests/ref/fate/vsynth2-wmv1
tests/ref/fate/vsynth2-wmv2
tests/ref/fate/vsynth2-yuv
tests/ref/lavf/avi
tests/ref/seek/h261_avi
tests/ref/seek/h263_avi
tests/ref/seek/h263p_avi
tests/ref/seek/lavf_avi
tests/ref/seek/mjpeg_avi
tests/ref/seek/mpeg4_adap_avi
tests/ref/seek/mpeg4_error_avi
tests/ref/seek/mpeg4_nr_avi
tests/ref/seek/mpeg4_qpel_avi
tests/ref/seek/mpeg4_qprd_avi
tests/ref/seek/mpeg4_rc_avi
tests/ref/seek/mpeg4_thread_avi
tests/ref/seek/msmpeg4_avi
tests/ref/seek/msmpeg4v2_avi
tests/ref/seek/wmv1_avi
tests/ref/seek/wmv2_avi

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

Merge commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68'

* commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68':
  lavf: move RIFF INFO tag writing from avienc to riff
  avconv: fix disabling auto mappings with -map_metadata

Conflicts:
ffmpeg_opt.c
libavformat/riff.h

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

Merge commit 'a25d912dca9cd553440167e0476c47581359c0fc'

* commit 'a25d912dca9cd553440167e0476c47581359c0fc':
  avcodec_encode_audio(): fix invalid free
  pcm-mpeg: correct bitrate calculation
  ffv1: K&R formatting cosmetics
  fate: Add rangecoder test
  network: #include stdint.h in network.h
  nut: export codec_tag provided by rawvideo
  avserver: move avserver-specific code from ffmdec.c to avserver.c

Conflicts:
ffserver.c
libavcodec/ffv1.c
libavformat/ffmdec.c
libavformat/nutenc.c
tests/ref/lavfi/crop
tests/ref/lavfi/crop_scale
tests/ref/lavfi/crop_scale_vflip
tests/ref/lavfi/crop_vflip
tests/ref/lavfi/null
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_crop
tests/ref/lavfi/pixfmts_hflip
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_pad
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip
tests/ref/lavfi/scale200
tests/ref/lavfi/scale500
tests/ref/lavfi/vflip
tests/ref/lavfi/vflip_crop
tests/ref/lavfi/vflip_vflip

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

lavc/tta: use meaningful error codes

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

tta: datalen is unsigned integer per reference library

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

sws-test: parse command line args before initing contexts

This fixes parsing comand line args after ref

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

lavf/swfdec: support DefineBitsLossless{,2} tag.

ffv1: fix packed rgb with 1.3

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

mov: fix time types related to mov_metadata_creation_time

Fixes Ticket1817
Based on patch by: Przemyslaw Wesolek <przemyslaw.wesolek@go.art.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

examples/muxing: fix video pts

Fixes Ticket1801
Based on suggestion from AztecC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

configure: Add support for Tilera processors

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

lavfi: limit matching w/h/fmt asserts to non scale filters

This fixes a regression with the scale filters input changing.
In the long run filters should get a flag to indicate support of this
and then this flag be used here.
But the regression should not be left standing until thats done.

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

libavfilter/buffersrc: Do not fail hard on changes of input parameters.

Several filters support this already.

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

ffmpeg: Make video filter graph reinit user selectable

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

yuvPlanartouyvy_c: fix sign extension

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

yuvPlanartoyuy2_c: fix sign extension

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

mp3enc: remove unneeded null ptr check

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

mov: print warning if ff_get_wav_header() fails

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

sierravmd: flip reduce arg order.

This should make no difference but might help static analyzers

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

nut: fix int32 overflow

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

riff: fix division by zero for G726

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

swr-test: fix division by 0

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

swr-test: check pointers before use

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

wavdec: check size before reading the data, not after.

wav: do not fail on empty INFO tags

Fixes Bug 379

CC: libav-stable@libav.org

lavf: split wav muxer and demuxer into separate files.