Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Support compilation on aix with gcc.
  Rename "AVClass class" as "AVClass component_class".
  Rename constant FRAMESIZE in ra144 codec as FRAME_SIZE.
  Rename thread_init() in libavcodec and libavfilter as library_thread_init().
  Rename constant HZ in af_biquads.c as HERTZ.
  Drop local lable from ppc asm timer.

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

avutil/x86: disable ff_evaluate_lls_sse2() for 32bit

It just segfaults on 32bit, thus its disabled until someone fixes it.

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

flac_parser: check return value of av_fifo_alloc()

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

lavf/movenc: use ffio_fill()

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

mpegts: use seek_back() for all seek backs

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

mpegts: factor seek_back() out

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

mpegts_read_header: goto fail instead of return directly

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mjpeg: Check the unescaped size for overflows

Conflicts:
libavcodec/mjpegdec.c

See: a9456c7c5ca883b5a3947e59a9fba5587e18e119

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

Merge commit '7520d9779c6d30b385df5a0a42da508238076192'

* commit '7520d9779c6d30b385df5a0a42da508238076192':
  mjpeg: Move code out of else branch

Conflicts:
libavcodec/mjpegdec.c

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

Support compilation on aix with gcc.

Shared libraries and the IBM compiler are currently not supported.
"--arch=ppc" has to be passed to configure, uname is not compatible.

Rename "AVClass class" as "AVClass component_class".

The aix header math.h defines "extern int class()" for C.

Rename constant FRAMESIZE in ra144 codec as FRAME_SIZE.

The aix header sys/mstsave.h defines FRAMESIZE as _FRAMESIZE.

Rename thread_init() in libavcodec and libavfilter as library_thread_init().

The aix header sys/thread.h contains a definition for thread_init().

Rename constant HZ in af_biquads.c as HERTZ.

The aix header sys/m_param.h defines HZ as _HZ.

Drop local lable from ppc asm timer.

The aix assembler does not support local lables.

Merge commit '7798a59dc14ae27efe64e639a42646002608a908'

* commit '7798a59dc14ae27efe64e639a42646002608a908':
  avconv: Don't include colorspace.h

No change as the commit is already part of ffmpeg.

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

Merge commit '02ec656af72030eea4f3d63e30b25625cce6a3df'

* commit '02ec656af72030eea4f3d63e30b25625cce6a3df':
  wmapro: error out on impossible scale factor offsets

The check is replaced by an assert(), as the condition cannot be
true except through bugs elsewhere (which should have been fixed
already)

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

Merge commit 'd4a217a408da4bd63acc02cd8f9ebe378a2ad65a'

* commit 'd4a217a408da4bd63acc02cd8f9ebe378a2ad65a':
  wmapro: check the min_samples_per_subframe

Conflicts:
libavcodec/wmaprodec.c

See: 9166f483c52e7e0a031a7bb149bea16aaa72f344

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

Merge commit '183880cfc4aae53ce504e13337791cad5841c80c'

* commit '183880cfc4aae53ce504e13337791cad5841c80c':
  pictor: use the correct logging context

No change, as this has already been fixed

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

avcodec/lpc: Use a function pointer from an initialized context

Fixes null pointer dereference

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

Merge commit 'c93ccf5a4cca722b39f05e9f5660b4cb75bc1740'

* commit 'c93ccf5a4cca722b39f05e9f5660b4cb75bc1740':
  lpc: use levinson for the first pass of multipass cholesky

Conflicts:
libavcodec/lpc.c

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

Merge commit 'b545179fdff1ccfbbb9d422e4e9720cb6c6d9191'

* commit 'b545179fdff1ccfbbb9d422e4e9720cb6c6d9191':
  x86: lpc: simd av_evaluate_lls

Conflicts:
libavutil/x86/lls.asm

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

lls.asm: disable ff_update_lls_avx

The code doesnt build with yasm from ubuntu 12.04

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

lls.asm: put avx code under if HAVE_AVX_EXTERNAL

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

Merge commit '502ab21af0ca68f76d6112722c46d2f35c004053'

* commit '502ab21af0ca68f76d6112722c46d2f35c004053':
  x86: lpc: simd av_update_lls

The versions are bumped due to changes in lls.h which is used across
libraries affecting intra library ABI
(This version bump also covers changes to lls.h in the immedeatly previous
 commits)

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

Merge commit '41578f70cf8aec8e7565fba1ca7e07f3dc46c3d2'

* commit '41578f70cf8aec8e7565fba1ca7e07f3dc46c3d2':
  lpc: use function pointers, in preparation for asm

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

Merge commit 'cc6714bb16b1f0716ba43701d47273dbe9657b8b'

* commit 'cc6714bb16b1f0716ba43701d47273dbe9657b8b':
  lpc: remove "decay" argument

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

mjpeg: Check the unescaped size for overflows

And contextually check init_get_bits success and fix the reporting
message.

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

mjpeg: Move code out of else branch

Simplify the control flow and spare some vertical space.

get_xbits: assert validity of the number of bits

similar is already done in the other get_bits() functions

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

4xm: Dont ignore dc run errors

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

4xm: check for invalid zero ac coeffs

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

mjpeg_decode_dc: check code before using it in get_xbits()

Fixes undefined behavior

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

ffmpeg: Don't include colorspace.h

The header is private, and ffmpeg.c doesn't use it
for anything.

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

get_pix_fmt_score: favor equal formats if all else equal

Fixes Ticket2578

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

avconv: Don't include colorspace.h

The header is private, and avconv.c doesn't use it
for anything.

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

update all trac links to use the trac subdomain

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Avoid a null pointer dereference on clean-up after oom in ac3 encoder.

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

wmapro: error out on impossible scale factor offsets

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

wmapro: check the min_samples_per_subframe

Must be at least WMAPRO_BLOCK_MIN_SIZE.

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

pictor: use the correct logging context

Broken in 6d97484d72e33f7dde9493a9ead1a72e2f029605

Added codec ID to playback DNxHD

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

Avoid a null pointer dereference on clean-up after oom in ac3 encoder.

Avoid a null pointer dereference on oom when decoding smacker.

Fixes ticket #2728.

Propagate error return values from the smacker decoder.

Avoid a null pointer dereference on oom when decoding vc1.

Fixes ticket #2723.

doc/muxers: apply various minor fixes to segment documentation

doc/muxers: sort muxers by name

lpc: use levinson for the first pass of multipass cholesky

Levinson is faster, and cholesky is only needed if we want to apply different
weights to different samples, which doesn't happen on the first pass.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

x86: lpc: simd av_evaluate_lls

1.5x-1.8x faster on sandybridge

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

x86: lpc: simd av_update_lls

4x-6x faster on sandybridge

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

lpc: use function pointers, in preparation for asm

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

lpc: remove "decay" argument

We never used the rolling-average mode, and this makes av_update_lls 15% faster.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wmapro: check num_vec_coeffs against the actual available buffer

Conflicts:
libavcodec/wmaprodec.c

The check is replaced by an assert.

See: b21ba20cc83c80fe56192fee3626a8087f37d806

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

Merge commit '6652338f43ef623045912d7f28b61adea05d27ae'

* commit '6652338f43ef623045912d7f28b61adea05d27ae':
  wmapro: return early on unsupported condition

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

Merge commit 'e30b068ef79f604ff439418da07f7e2efd01d4ea'

* commit 'e30b068ef79f604ff439418da07f7e2efd01d4ea':
  wmapro: make sure there is room to store the current packet

The check is replaced by an assert as it is impossible to occur
See: 780d45473c32fa356c8ce385c3ea4692567c3228

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

Merge commit 'afe03092dd693d025d43e1620283d8d285c92772'

* commit 'afe03092dd693d025d43e1620283d8d285c92772':
  lavc: move put_bits_left in put_bits.h

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

avformat: make av_register_*put_format() thread safe

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

avcodec/bitstream_filter: make av_register_bitstream_filter() thread safe

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

avcodec/parser: Make av_register_codec_parser() thread safe

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

avcodec: Make av_register_hwaccel() and avcodec_register() thread safe

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

cosmetics: Fix "dont" "wont" "doesnt" typos

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

flac_parser.c: fix case when final frame is a false positive

Should fix https://ffmpeg.org/trac/ffmpeg/ticket/2552
Only did minimal testing on a few files and fate.

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

udp: Fix receiving large udp packets

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

tak_parser: properly mark packets as key frames

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

Do not list libshine like a main option in configure's output.

It is listed as an enabled external library if applicable.

wmapro: check num_vec_coeffs against the actual available buffer

Prevent yet another buffer overwrite.

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

wmapro: return early on unsupported condition

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

wmapro: make sure there is room to store the current packet

Prevent horrid and hard to trace struct overwrite.

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

lavc: move put_bits_left in put_bits.h

doc/decoders: document libopus decoder

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

doc/encoders: alphabetically list the encoders

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

avfilter/avfilter: Make avfilter_register() thread safe

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Avoid a null pointer dereference in avcodec_decode_video2().
  Set block_align when reading QDM2 in mov.
  Fix muxing QDM2 mono into caf.

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aac: return meaningful errors

Conflicts:
libavcodec/aacdec.c

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

Merge commit '6d8629aac13692447b54eac795bf74007ebf8987'

* commit '6d8629aac13692447b54eac795bf74007ebf8987':
  aac: K&R formatting cosmetics

Conflicts:
libavcodec/aacdec.c

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

Avoid a null pointer dereference in avcodec_decode_video2().

This could happen if oom occured while probing a file.
Reported in ticket #1900.

Set block_align when reading QDM2 in mov.

Fixes ticket #2718.

Fix muxing QDM2 mono into caf.

avfilter/vf_mp:  preserve pixel format when possible

Fixes Ticket2577

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

gxf: Added codec ID to playback AVCHD

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

lavc/mpegvideo_enc: simplify timestamp checks in load_input_picture()

Also improve error feedback while at it.

Added GXF format code to identify AVC Intra video streams. This was an extension to the origional GXF spec implemented by Grass Valley.

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

gxf: Factorize code in get_sindex()

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

gxf: Added GXF format code 25 which is used for DV codec in HD resolutions

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

Fix copying extradata to codec in mxfdec.c

The code that copies any extradata from the MXFDescriptor to the codec does
not set the size, which it should otherwise the copied data is useless.
Attached it a patch to correct this.

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

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: simplify and fix flushing out old subtitles on seeking

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

aac: return meaningful errors

aac: K&R formatting cosmetics

ffprobe: always exit 1 in case of errors

This is consistent with the other ff* tools, and also avoids spurious
success reports when ret%256 = 0.

ffprobe: reindent after previous commit

ffprobe: fix exit code with stream specifiers

Without this fix, ffprobe would exit with a failure exit code if a stream
specifier is given that selects the last stream.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>

ffprobe: simplify branching logic in probe_file()

examples/muxing: rename audio/video_pts to audio/video_time

The new name is less confusing, since the variables represent times
rather than timestamps.

doc/bitstream_filters: document the chomp filter

TODO: add some meaningful examples.

doc/bitstream-filters.texi: add documentation for the aac_adtstoasc filter

Based on the notes in libavcodec/aac_adtstoasc_bsf.c.

lavf/movenc: improve error feedback in case malformed AAC bitstream is detected

Consistent with the FLV muxer.

lavf/mux: rename variable cortag -> tagbuf2 in init_muxer()

Possibly enhance readibility.

lavc/utils: improve feedback in case of invalid packet size

examples/Makefile: disable -O2 optimizations

There is no much point in optimizing example code, and the -O2 flag is
annoying when debugging.