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.

examples/muxing: remove useless instruction

Simpler and less confusing.

ffplay: simplify and fix flushing out old subtitles on seeking

Fixes the additional issue reported in ticket #2666.

Signed-off-by: Marton Balint <cus@passwd.hu>

doc/filters: Fix texi syntax

Commit f1efaf837117718e3b4c96336fe9b5f686b1fe30 used parentheses
instead of curly braces in texi syntax, resulting in warnings when
the documentation is generated. Fix that.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

swscale: Fix PAL8 input with alpha

Fixes Ticket2158

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

avfilter/src_movie: Fix handling of packet size for video

See Ticket2556

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

libavfilter/src_movie: fix which packet is reset

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

Require pthreads for compilation with OpenCL support.

Fixes a part of ticket #2422.

Reviewed-by: James Almer

Use AV_RN32 for an unaligned read in the mxg demuxer.

Fixes ticket #2707.

lavf: silence max_analyze_duration warning

This is part of normal operation with some formats. A warning should
indicate that something is wrong, and the documentation for AV_LOG_WARNING
says: "Something somehow does not look correct."

Since this message is most likely useful for debugging only, raise the
log level accordingly.

Plus-one-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/cllc: Fix clobbered ff_get_buffer() change

Issue-since: 9328ae484338b70a7f2dbcd420bbbac499df76cc

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

vf_drawbox: give all v_log() a context

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

vf_drawbox: avoid declaration in for() arguments

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

Merge branch 'drawbox_exprs' of https://github.com/mjmvisser/FFmpeg

* 'drawbox_exprs' of https://github.com/mjmvisser/FFmpeg:
  enabled expressions on x, y, w, h and t parameters for drawgrid and drawbox, added examples

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

xa: abort if number of channels or sample rate is 0

Fixes #2711.

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

lxfdec: remove wrong and unneeded check

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

examples/muxing: vertically align

lavc/pngdec: return meaningful error codes

enabled expressions on x, y, w, h and t parameters for drawgrid and drawbox, added examples

lavfi/movie: free packet on decoder error

Prevents infinite loop, see Ticket2556

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Do not omit frame pointers for msvc/icl debug builds

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

Merge commit '9f4a16c52ea8f2383244587ea4cb534fe7f6da49'

* commit '9f4a16c52ea8f2383244587ea4cb534fe7f6da49':
  configure: Do not explicitly set Oy for msvc/icl

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

Merge commit 'b6507930ac1898aed62ab0b56afc7d6734ad830b'

* commit 'b6507930ac1898aed62ab0b56afc7d6734ad830b':
  fate: Add Canopus Lossless YUY2 test

Conflicts:
tests/fate/lossless-video.mak
tests/ref/fate/cllc-yuy2-noblock

No change as the change is already in master

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

fate: Add Canopus Lossless YUY2 test

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'd9c89ef86b9400e50c2486f9406fad15c85bab22'

* commit 'd9c89ef86b9400e50c2486f9406fad15c85bab22':
  cllc: Use outbuf in RGB and ARGB functions
  cllc: Implement YUV support

Conflicts:
libavcodec/cllc.c

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

Merge commit 'b0ce601c160c87349d093d7e542b5c752754f598'

* commit 'b0ce601c160c87349d093d7e542b5c752754f598':
  doc/platform: Add info about ICL

Conflicts:
doc/platform.texi

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

yuv4mpeg: correctly handle chroma for odd luma sizes.

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

configure: Do not omit frame pointers for msvc/icl debug builds

Because O1 or O2 are required to build libav with msvc/icl, this must be
explicitly set instead of just omitting Oy.

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

configure: Do not explicitly set Oy for msvc/icl

It is implied by O1 or O2, both of which are required to build libav
with msvc/icl.  Silences warnings when targeting x64 with icl.

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

fate: Add Canopus Lossless YUY2 test

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

lavf/webvttdec: use private option to specify WebVTT kind

WebVTT subtitle tracks have four kinds. Certain downstream muxers
(such as for WebM) need to know which WebVTT kind this is, in order to
specify the codec id of the output track.

A new private input option, "-kind", has been added to the WebVTT
demuxer.  It accepts as a value any of "subtitles" (the default),
"captions", "descriptions", and "metadata".  The kind option value is
used to assign a value to the stream disposition flag, to which four
new values have been added, corresponding the four WebVTT kinds.

Signed-off-by: Matthew Heaney <matthewjheaney@google.com>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>

lavf: add AV_DISPOSITION flags for WebVTT text track kinds

There are 4 separate WebVTT text track kinds: subtitles (the default
if not otherwise specified), captions, descriptions, and metadata.
The WebM muxer needs to know which WebVTT text track kind this is, in
order to synthesize the correct track type and codec id.

To allow a demuxer to indicate the text track kind of the input, a new
set of AV_DISPOSITION flag values has been added, corresponding to
each of the non-default text track kind values.

cllc: Use outbuf in RGB and ARGB functions

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

cllc: Implement YUV support

Fixes ticket #1910.

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

avfilter/vsrc_testsrc: fix artifacts with odd height

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

cllc: Use outbuf in RGB and ARGB functions

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

cllc: Implement YUV support

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

doc/platform: Add info about ICL

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

h264: Fix null pointer dereference with disabled error concealment

Fixes Ticket2551

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

avformat/avio: Fix EOF handiling of ffurl_read_complete()

Fixes Ticket2537

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavf: don't abort if both encoder and muxer aspect ratios are not set

Conflicts:
libavformat/mux.c

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

Merge commit 'c3e58f8fb75d8467161a65b85eb88281547ebab1'

* commit 'c3e58f8fb75d8467161a65b85eb88281547ebab1':
  matroskaenc: restore compatibility with non referenced AVPacket

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

Merge commit '95d52464542f532061290192518d5fe1c1930e8d'

* commit '95d52464542f532061290192518d5fe1c1930e8d':
  lavc: Add option to encode MPEG-2 AAC with libfdk-aac

Conflicts:
doc/APIchanges
libavcodec/version.h

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

Merge commit 'ace87c19ed4c4882d7b9b3ce512c4c195e39a203'

* commit 'ace87c19ed4c4882d7b9b3ce512c4c195e39a203':
  configure: whitespace cosmetics

Conflicts:
configure

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

Merge commit '6dc6598692da3b0ebda2d768681786343f26a4f4'

* commit '6dc6598692da3b0ebda2d768681786343f26a4f4':
  configure: Simplify an expression with enabled_all.

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

lavf: don't abort if both encoder and muxer aspect ratios are not set

Signed-off-by: Anton Khirnov <anton@khirnov.net>

matroskaenc: restore compatibility with non referenced AVPacket

Signed-off-by: Anton Khirnov <anton@khirnov.net>

lavc: Add option to encode MPEG-2 AAC with libfdk-aac

Signed-off-by: Anton Khirnov <anton@khirnov.net>

msmpeg4: Fix ff_msmpeg4_pred_dc() so it works with lowres>0

Fixes Ticket2532

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

cmdutils: dont change the log level for -report

Fixes Ticket2476

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

sonic: use av_freep() as its safer than av_free()

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

sonic: cleanup/simplify num_taps check

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

sonic: replace divide() by ROUNDED_DIV()

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

vp8: wait for prev_frame to parse segment_map before reading it.

This fixes occasional failures of vp8-test-vector-010 with frame-level
multithreading enabled.

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: More msvc/icl combining

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

Merge commit 'f963f701d90bd7bb03e39aab4e59bd137084e082'

* commit 'f963f701d90bd7bb03e39aab4e59bd137084e082':
  ogg: relax demuxer conformance checks

Conflicts:
libavformat/oggdec.c

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

Merge commit '42cc6cefd315c1556e2a52f7ebe2f766ec82b790'

* commit '42cc6cefd315c1556e2a52f7ebe2f766ec82b790':
  avconv: report the error for codec open failure

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

Merge commit '1e340af8d6a97cc013a2ad8ba77c77129625a34f'

* commit '1e340af8d6a97cc013a2ad8ba77c77129625a34f':
  avconv: drop additional strerror fallback

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

configure: whitespace cosmetics

configure: Simplify an expression with enabled_all.

sonic: avoid float sqrt() for integer input & output

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

sonic: simplify quant cliping

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

sonic: use av_calloc()

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

configure: More msvc/icl combining

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

avisynth: Make sure the filename passed to Avisynth is in the right code page

Avisynth is a non-unicode application and cannot accept UTF-8
characters. Therefore, the input filename should be converted to
the code page that it expects.

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

configure: Enable MinGW-w64's implementation of vsnprintf and pals

As of r5799 in MinGW-w64's trunk, which is he upcoming major version 3,
the POSIX-compliant vsnprintf implementation is disabled by default.
Enable it for this version. Keep using out own implementation for
prior versions, because it is broken in them.

Relevant Reference Thread: http://article.gmane.org/gmane.comp.gnu.mingw.w64.general/7133

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

sonic: replace literal numbers by sizeof()

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

sonic: replace some float by integers to improve platform independance

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

sonic: Improve error codes

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

sonic: simplify shift_down()

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

ogg: relax demuxer conformance checks

Some samples in the wild are missing headers that are expected by the
specification but in practice do not affect decoding.

avconv: report the error for codec open failure

External codec may have corner case reason to fail at init, better
report them instead having the user wonder.