Merge remote-tracking branch 'qatar/master'

* qatar/master:
  westwood_vqa: fix SND0 chunk handling
  westwood_vqa: set video stream duration
  raw: forward avpicture_fill() error code in raw_decode().
  build: Do not explicitly add the doc directory to the OBJDIRS list.
  dv: Split off DV video decoder into its own file.
  build: fix RALF decoder standalone compilation, which depends on Golomb code
  configure: Drop stray duplicate entry for --disable-fft from help output.

Conflicts:
libavcodec/dv.c
libavcodec/rawdec.c
libavformat/westwood_vqa.c

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

h263dec: Restore w/h values to a consistent state if a change is rejected.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

id3v2: support JPEG APIC with incorrect (image/jpg) MIME type

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

Support FLIC in AVI.

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

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: pause rdft column when ffplay is paused

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

ffplay: pause rdft column when ffplay is paused

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

XBM decoder

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

j2kdec: move ff_j2k_init_tier1_luts() to j2kdec_init()

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

Clarify the use of the interl=1|-1 option of the scale filter.

It is not entirely clear that whilst for width and height only an
expression needs to be provided, for interlace the option must
also be given.

It is also unclear that the default is non interlaced aware scaling.

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

alsdec: check return values.

westwood_vqa: fix SND0 chunk handling

Version from vqa header does not dictate which sound chunks may
appear in file.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>

westwood_vqa: set video stream duration

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>

raw: forward avpicture_fill() error code in raw_decode().

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

h264: dont mess with chroma planes for grayscale h264.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

alsdec: make sure no invalid opt_order stays in the context.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

vc1dec: dont ignore ff_vc1_parse_frame_header_advs return value

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

vc1dec: avoid == -1 checks for errors.

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

vc1dec: sanity check state used in get_mvdata_interlaced()

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

oma: dont over-read buffer

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  make av_interleaved_write_frame() flush packets when pkt is NULL
  mpegts: Fix dead error checks
  vc1: Do not read from array if index is invalid.
  targa: convert to bytestream2.
  rv34: set mb_num_left to 0 after finishing a frame

Conflicts:
libavcodec/targa.c
libavcodec/vc1data.c

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

build: Do not explicitly add the doc directory to the OBJDIRS list.

Now that a documentation generator is built in the doc directory,
this is no longer necessary.  Fixes the Make warning:
Makefile:188: target `doc' given more than once in the same rule.

dv: Split off DV video decoder into its own file.

build: fix RALF decoder standalone compilation, which depends on Golomb code

configure: Drop stray duplicate entry for --disable-fft from help output.

make av_interleaved_write_frame() flush packets when pkt is NULL

This patch allows the user to force flushing of all queued packets
by calling av_interleaved_write_frame() with pkt set to NULL.

Signed-off-by: Jindrich Makovicka <jindrich.makovicka@nangu.tv>
Signed-off-by: Martin Storsjö <martin@martin.st>

doc: clarify dshow input requirements

j2kdec: remove pointless swapping

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

j2kdec: vertically align AVCodec members

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

j2kdec: Remove useless .pix_fmts.

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

j2kdec: convert to bytestream2 API

Protects against overreads.

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

mpegts: Fix dead error checks

vc1: Do not read from array if index is invalid.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>

targa: convert to bytestream2.

Also remove some write-only variables or write-only variable
assignments, remove internal colorspace conversion to native
endianness (that can be done by swscale much more efficiently),
and some cosmetics.

ffmpeg: fix handling or empty audio packets

Fixes Ticket1131

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

ffmpeg: more verbose error messages in case of audio encoding failure.

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

Revert "raw: move buffer size check up."

This reverts commit cc5dd632cecc5114717d0b90f8c2be162b1c6ee8.
The change was redundant, it has been fixed long ago (422e3a7)

Conflicts:

libavcodec/rawdec.c

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

rv34: set mb_num_left to 0 after finishing a frame

Prevents running error resilience on a previous frame which will write
to the pic->mb_type[] array of the previous image. The array might
already be re-used for a new image in a subsequent thread, thus cause
two threads to write to the same pic->mb_type[] array, causing a race
condition which can crash in rv34_decode_cbp(), called by
rv34_decode_inter_mb_header() (which accesses mb_type[] twice,
assuming values are maintained, which the race condition breaks).

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

j2kenc: cosmetics: vertically align AVCodec members.

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

libopenjpegdec: hack to fix GRAY16 decoding

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

vc1dec: move mquant zero check down.

This way it catches all cases, and prevents later segfaults.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

targa: Fix input buffer size check.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

RELEASE: bump to current version (0.10.2).

APIchanges: fill in missing dates and hashes.

aac: reference supported sample rates in encoders.

ffmpeg: more expressive sample rate automatic selection.

Output now lists the available sample rates with commands like
ffmpeg -f lavfi -i aevalsrc=0 -ar 20000 -y /tmp/out.mp3

lavfi: add avfilter_fill_frame_from_{audio_,}buffer_ref().

indeo3dec: check mv bitstream pointer

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

indeo3dec: Fix end pointer.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: ppc: drop stray leftover backslash
  build: Only clean the architecture subdirectory we build for.
  build: drop some unnecessary dependencies from the H.264 parser
  build: prettyprinting cosmetics
  libavutil: Remove pointless rational test program.
  libavutil: Remove broken and pointless lzo test program.
  lavf doxy: expand AVStream.codec doxy.
  lavf doxy: improve AVStream.time_base doxy.
  lavf doxy: add some basic documentation about reading from the demuxer.
  lavf doxy: document passing options to demuxers.
  lavf doxy: clarify that an AVPacket contains encoded data.
  mpegtsenc: allow user triggered PES packet flushing
  APIchanges: mark the place where 0.7 was cut.
  APIchanges: mark the place where 0.8 was cut.
  APIchanges: fill in missing dates and hashes.
  smacker: convert palette and header reading to bytestream2.
  alac: convert extradata reading to bytestream2.

Conflicts:
doc/APIchanges
libavcodec/smacker.c
libavcodec/x86/Makefile
libavfilter/Makefile
libavutil/Makefile

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

Enable generic index/seeking for mgsts demuxer.

This depends on the proposed parser change for 0-size packets
in previous mail, otherwise video now plays far too fast.

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

Handle 0-size sync packets when only parsing headers.

Currently, the duration of those packets is just discarded
when enabling parsing, thus the output of the Metal Gear Solid
demuxer breaks completely when just setting AVSTREAM_PARSE_HEADERS.
The result will not be correct if a parser creates a delay even
with PARSER_FLAG_COMPLETE_FRAMES and there might be other cases
where it does not work correct, but just discarding them as it
is done currently seems worse.

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

Support FLIC in MOV.

Fixes trac issue #626.

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

build: ppc: drop stray leftover backslash

als: consistent messages

"." for warnings, "!" for errors.

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

libopenjpegenc: remove leftover because older version of patch being applied

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

ALS error message pretty print

One prettier message.

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

qdm2: Fix out of array writes

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

qdm2: fix out of array read

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

qdm2dec: fix out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

mxfdec: fix off by one error.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

build: Only clean the architecture subdirectory we build for.

This allows simplifying the Makefiles; it is no longer necessary to register
arch subdirectory Makefiles, just putting them in place is enough.

build: drop some unnecessary dependencies from the H.264 parser

build: prettyprinting cosmetics

libavutil: Remove pointless rational test program.

libavutil: Remove broken and pointless lzo test program.

lavf doxy: expand AVStream.codec doxy.

lavf doxy: improve AVStream.time_base doxy.

Remove confusing sentence that implied the user should set the timebase.
Elaborate on how the timebase is set for muxing.

lavf doxy: add some basic documentation about reading from the demuxer.

lavf doxy: document passing options to demuxers.

lavf doxy: clarify that an AVPacket contains encoded data.

mpegtsenc: allow user triggered PES packet flushing

Signed-off-by: Jindrich Makovicka <jindrich.makovicka@nangu.tv>
Signed-off-by: Martin Storsjö <martin@martin.st>

APIchanges: mark the place where 0.7 was cut.

APIchanges: mark the place where 0.8 was cut.

APIchanges: fill in missing dates and hashes.

libopenjpegdec: refactor some code and fix memory leaks

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

libopenjpegdec: always check image because decoding may still fail

Fixes bunch of segfaults.

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

libopenjpegenc: allow changing encoding parameters

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

libopenjpegenc: merge common code

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

libopenjpegenc: use pix_fmt descriptor to get bpp

This will also simplify adding support for RGB565 and similar.

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

libopenjpegenc: use pix_fmt descriptor to get numcomps

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

indeo4: better mv check

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

indeo5: check motion vectors.

fixes out of frame reading

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

mxfdec: pass correct context to av_timecode_init()

fixes null ptr dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

smacker: convert palette and header reading to bytestream2.

vf_hflip: accept PIX_FMT_RGB444 and PIX_FMT_BGR444 pixel formats

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

png: fix warning about discarding qualifiers [-Wincompatible-pointer-types]

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

pthread : Remove lock/unlock pairs in worker loop to avoid unexpected state changes.

Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: dsputil: prettyprint gcc inline asm
  x86: K&R prettyprinting cosmetics for dsputil_mmx.c
  x86: conditionally compile H.264 QPEL optimizations
  dsputil_mmx: Surround QPEL macros by "do { } while (0);" blocks.
  Ignore generated files below doc/.
  dpcm: convert to bytestream2.
  interplayvideo: convert to bytestream2.
  movenc: Merge if statements
  h264: fix memleak in error path.
  pthread: Immediately release all frames in ff_thread_flush()
  h264: Add check for invalid chroma_format_idc
  utvideo: port header reading to bytestream2.

Conflicts:
.gitignore
configure
libavcodec/h264_ps.c
libavcodec/interplayvideo.c
libavcodec/pthread.c
libavcodec/x86/dsputil_mmx.c

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

alac: convert extradata reading to bytestream2.

swr-test: test the new flexible buffering

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

swr: realloc_audio: support packed audio buffers

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

swr: More flexible and convenient buffering

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

Fix SVCD scan_offset option

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

"Metal Gear Solid: The Twin Snakes" demuxer

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

CrystalHD: Remove EXPERIMENTAL flag for known good formats.

With the flag in place, it's hard to actually use the decoder, and
I'm happy with how it works, with the exception of DivX3 where I've
never found a sample that worked that I was confident actually
matched what the hardware claimed to support.

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

pthread: return proper error code on pthread_create failure

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

swr: fix segfault when 0 out size is used.

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

swr: revert stray hunk

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

VC1: Do not needlessly use signed types.

This might even have prevented the compiler from some optimizations,
since both signed and unsigned types are used for the dezigzag tables/
table pointers, and if a branches uses both the compiler needs to
create more complex code.

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

DV: detect another case of broken DV files.

See trac issue #217.
Only the dsf field seems to be used to distinguish between PAL and NTSC.

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