avformat/img2: Make AVOptions available to img* demuxers defined in other files

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

avformat/rmdec: very basic MLTI support

Fixes Ticket2152

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

ffmpeg: Do av_buffersink_set_frame_size() when reconfiguring the filtergraph not just when changing audio resample parameters

Fixes Ticket3562

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

Merge commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04'

* commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04':
  doc: Fix syntax and logical errors in avconv stream combination example

Conflicts:
doc/ffmpeg.texi

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

avcodec/h264: Use FF_ALLOCZ_ARRAY_OR_GOTO()

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

avcodec/dnxhdenc: Use FF_ALLOCZ_ARRAY_OR_GOTO()

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

avcodec/mpegvideo: Use FF_ALLOCZ_ARRAY_OR_GOTO()

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

avcodec/twinvq: Use FF_ALLOC_ARRAY_OR_GOTO()

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

doc: Fix syntax and logical errors in avconv stream combination example

Bug-Id: 661
CC: libav-stable@libav.org

avcodec/aacenc: Use FF_ALLOCZ_ARRAY_OR_GOTO()

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

avcodec/ac3enc_template: Use FF_ALLOC_ARRAY_OR_GOTO()

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

avcodec/adpcmenc: Use FF_ALLOC_ARRAY_OR_GOTO()

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

avformat/concatdec: fix "warning: explicitly assigning a variable of type int to itself"

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/mp3dec: Improve seeking frame sync code

Fixes Ticket3884

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

av_filter/x86/idet: use HADDD where appropriate

Signed-off-by: James Almer <jamrial@gmail.com>

avformat: remove FF_API_ASS_SSA dead code

avcodec/snow: make new_picture const

Fixes "assignment discards const qualifier from pointer target type"

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

Merge commit 'ee0ebd3c1412fdd9d80aa97c98d1a20b893f1f47'

* commit 'ee0ebd3c1412fdd9d80aa97c98d1a20b893f1f47':
  dv: K&R formatting cosmetics

Conflicts:
libavcodec/dv.c
libavcodec/dv.h
libavcodec/dv_profile.c
libavcodec/dvdec.c
libavcodec/dvenc.c

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

Merge commit 'f629705b0239c80fddc1b0b15ed4bb9042c77d23'

* commit 'f629705b0239c80fddc1b0b15ed4bb9042c77d23':
  x86inc: Make INIT_CPUFLAGS support an arbitrary number of cpuflags

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

Merge commit 'ec217218c27d53c5b323323e6ef862bcdbcabe5f'

* commit 'ec217218c27d53c5b323323e6ef862bcdbcabe5f':
  x86inc: Free up variable name "n" in global namespace

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

Merge commit '176a0fca3fd64f91d585f96137388e00d8c101b6'

* commit '176a0fca3fd64f91d585f96137388e00d8c101b6':
  x86inc: Make ym# behave the same way as xm#

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

av_filter/x86/idet: MMX/SSE2 implementation of 16bits filter_line()

tested on http://ps-auxw.de/10bit-h264-sample/10bit-eldorado.mkv
MMX: ~30% faster decoding overall
SSE2:~40% faster

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

dv: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>

avcodec/rawenc: drop sizeof(AVFrame) dependency

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

Merge commit '9752d07d33d5370f7819865fbb5e582b982aad06'

* commit '9752d07d33d5370f7819865fbb5e582b982aad06':
  dirac: K&R formatting cosmetics

Conflicts:
libavcodec/dirac.c
libavcodec/dirac_parser.c

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

x86inc: Make INIT_CPUFLAGS support an arbitrary number of cpuflags

Previously there was a limit of two cpuflags.

Signed-off-by: Diego Biurrun <diego@biurrun.de>

x86inc: Free up variable name "n" in global namespace

Signed-off-by: Diego Biurrun <diego@biurrun.de>

x86inc: Make ym# behave the same way as xm#

This makes more sense for future implementations of templates with zmm registers.

Signed-off-by: Diego Biurrun <diego@biurrun.de>

dirac: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>

avformat/mpeg: update comment on probe score

Found-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avdevice/x11grab: fix cursor drawing in multi-screen setup

The code uses XFixes to retrieve the cursor coordinates, but XFixes
gives no information of what screen the pointer is on; this results in
always drawing the cursor on the captured screen even if the mouse
pointer was on another screen.

For example, when capturing from screen 1 (i.e. -f x11grab -i ":0.1")
the cursor was being drawn in the captured image even when the mouse
pointer was actually on screen 0, which is wrong and visually confusing.

Use XQueryPointer to check that the pointer is actually on the screen
which is being captured.

Signed-off-by: Antonio Ospite <ao2@ao2.it>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avdevice/x11grab: rename the "w" Window to "root" in paint_mouse_pointer

This specifies better the meaning of the variable, and is also in
preparation of a subsequent change which will introduce a temporary
Window variable for which "w" is an good name.

Signed-off-by: Antonio Ospite <ao2@ao2.it>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avfilter/vf_cropdetect: Do not check lines or columns twice on black frames

Idea from patch by: hjiodjf 97xgw46 <jfbvxt@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/mpeg: increase score for short mpeg-ps by 1

Fixes Ticket 3855

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

Merge commit '1ec335513f95bf2441f81d761ea127325ecd81a0'

* commit '1ec335513f95bf2441f81d761ea127325ecd81a0':
  time: Add missing zero

Conflicts:
libavutil/time.c

See: ebef9f5a56d7df91e010a177a80cfc8dbe394305

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

time: Add missing zero

Leftover of 56d7df91e010a177a80cfc8dbe394305

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

avcodec/mpeg4videodec: fix 'libavcodec/mpeg4videodec.c:2762:22: warning: unused variable mpeg4_vdpau_class [-Wunused-const-variable]'

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

avcodec/cabac_functions: fix "warning: UNCHECKED_BITSTREAM_READER is not defined, evaluates to 0"

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

avcodec/diracdec: Fix "warning: comparison of constant 4 with expression of type enum dirac_subband is always true [-Wtautological-constant-out-of-range-compare]"

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

Revert the default for ffplay to -noautoexit.

Reviewed-by: Marton Balint

Print bits_per_raw_sample for ffprobe -show_streams.

Fixes ticket #3919.

Print the actual bit depth for audio if it is different from the sample_fmt bit depth.

This is already done for video.

avcodec/ac3dec_fixed: remove unused arrays

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

avformat/rtpdec_qt: Fix 'warning: passing argument 2 of ffio_init_context discards const qualifier from pointer target type'

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

MAINTAINERS: add myself as segment maintainer

lavf/segment: abort in case of invalid segment format options

avformat/utils: Exclude the header size when computing duration from bit_rate

This improves the estimate for MP3s with cover art tags.

Fixes Ticket2931

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

Merge commit '1274ea8dbaec44355bde07f6bb31fec0c4e6fd2d'

* commit '1274ea8dbaec44355bde07f6bb31fec0c4e6fd2d':
  Split off floating point AAN (I)DCT into separate components

Conflicts:
configure
libavcodec/Makefile
libavcodec/dct-test.c
libavcodec/idctdsp.c

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

Merge commit 'fcf597625c7a991ca389f3a9b8ff4f5e383301c0'

* commit 'fcf597625c7a991ca389f3a9b8ff4f5e383301c0':
  ismindex: Avoid writing ismf files if no base name has been specified

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

Merge commit '803e82276b3716bf6012ec69e8854dae14a4fd2b'

* commit '803e82276b3716bf6012ec69e8854dae14a4fd2b':
  libavformat: Check mkdir return error codes

Conflicts:
libavformat/hdsenc.c
libavformat/smoothstreamingenc.c

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

ffserver: tests, force +global_header for ASF

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

Split off floating point AAN (I)DCT into separate components

ismindex: Avoid writing ismf files if no base name has been specified

Previously, this could create files named "(null).ismf", if the -ismf
parameter is specified (before an input file name), but without
specifying any base name.

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

libavformat: Check mkdir return error codes

Previously, the returned error codes were intentionally ignored
(see fadd3a68213), to avoid aborting if the directory already
existed. If the mkdir actually failed, this was caught when
opening files within the directory fails anyway.

By handling the error code here (but explicitly ignoring EEXIST),
the error messages and return codes in these cases are more
appropriate and less confusing.

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

doc/filters.texi: improve the wording of the expr_int_format documentation

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

avformat/m4vdec: Check for non startcode 00 00 00 sequences in probe

Fixes miss detection of PCM as m4v
Fixes Ticket 3928

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

avcodec/mpegvideo: Set err on failure in ff_mpv_common_frame_size_change()

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

avcodec/mpegvideo: check that the context is initialized in ff_mpv_common_frame_size_change()

The function otherwise would initialize the context without setting context_initialized
alternatively we could set context_initialized

Fixes valgrind anomalies related to ticket 3928

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

avcodec/mpegvideo: Use "goto fail" for all error paths in ff_mpv_common_frame_size_change()

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

avcodec/mpegvideo: free_context_frame() cannot fail, make it return void

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

doc/muxers/segment: reword text for examples, improve consistency

lavf/segment: add segment_format_options option

libswresample: move condition to start of loop.

This avoids several issue like calculating sum/maxcoef
incorrectly due to adding up matrix entries that will
be overwritten, as well as out-of-range writes to
s->matrix if the maximum allowed number of channels is used.

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

Remove pointless if.

A branch to avoid some calculation seems unlikely to have any benefits.

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

libswresample: Avoid needlessly large on-stack array.

We only actually need to use a tiny part of it.
Unfortunately we seem to have no real test coverage on
the code, so this is a bit risky.

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

ffmpeg: Copy extradata if it has been initialized later from the encoder

Fixes Ticket3909

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

avcodec/h264: Allow partial escaping

Fixes Ticket3923

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

avformat/swfdec: Do not change the pixel format

This is currently not supported
Fixes part of Ticket 3539

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

avfilter/af_silenceremove: remove dead code

Fixes CID1237284

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

avcodec/hevc_ps: Always initialize backup in decode_vui()

Fixes CID1237283

Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

RELEASE_NOTES: mention the ffplay -autoexit behaviour change

huffyuvdec: avoid large stack use.

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

cabac: Allow hardcoding CABAC table.

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

cabac: initialize all of ff_h264_cabac_tables programmatically.

Moves it from .data to .bss, slightly reducing binary size.

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

aacsbr: support hardcoding tables.

For sbr_qmf_window_us there is even a question if it maybe
should be fully hardcoded all the time.
Since half of it is coded, it ends up in .data and not .bss.

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

avcodec/hevc: fix dead code

fix CID 1231985

cherry picked from commit 745a35a777eaa5f77b8660b44098110a29916aae
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ffplay: make autoexit the default

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

Merge commit '041caf1a63f091745b95a6d51c23fbdcb604d4ce'

* commit '041caf1a63f091745b95a6d51c23fbdcb604d4ce':
  avplay: Exit by default at the end of playback

Conflicts:
Changelog
ffplay.c

Changes to ffplay not merged as they would break -autoexit as a way to override -noautoexit,
the change of the default will be implemented in the next commit

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

avformat/mpegts: fix spelling error

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

avplay: Exit by default at the end of playback

This is the expected behavior shared by all other cli multimedia players.

Bug-Id: 732

avfilter/ebur128: rework channel weighting definition code

Should fix CID1194399 (Bad bit shift operation)

avcodec/mjpegdec: fix rounding of chroma_height

Fixes green line at the bottom
Fixes Ticket3913

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

doc: Copyright in CSS, CSS split in 2 files

Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavd/v4l2: introduce enqueue_buffer()

Additionally, make sure a buffer gets enqueued again (even in error paths) after
it has been succesfully dequeued.

Tested-by: Dmitry Volyntsev <xeioexception@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/srtdec: speed up probing

avformat/realtextdec: UTF-16 support

Also remove ff_smil_extract_next_chunk - this was the last user of it.

avformat/samidec: UTF-16 support

ff_smil_extract_next_chunk() is still used by RealText.

avformat/srtdec: UTF-16 support

avformat/assdec: UTF-16 support

Use the UTF-16 BOM to detect UTF-16 encoding. Convert the file contents
to UTF-8 on the fly using FFTextReader, which acts as converting wrapper
around AVIOContext. It also can work on a static buffer, needed for
format probing. The FFTextReader wrapper now also takes care of skipping
the UTF-8 BOM.

Fix Ticket #3496.

avcodec/mpegvideo: set codec tags in ff_mpv_decode_init()

Fixes Ticket3912

Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/mpegvideo: Factor ff_mpv_decode_init() out

Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavd/v4l2: simplify list_formats()

We can avoid passing file descriptor fd explicitely.

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

Merge commit '2143948381c8118bdc2f50bd4079520b9885bd54'

* commit '2143948381c8118bdc2f50bd4079520b9885bd54':
  Drop unnecessary av_unused attributes.

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

MAINTAINERS: fix typo

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

add silenceremove filter

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

Merge commit '213e606752d16f51337e94431962fb5d7749c07e'

* commit '213e606752d16f51337e94431962fb5d7749c07e':
  Replace av_unused attributes by block structures

Conflicts:
libavcodec/h264_loopfilter.c

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

Merge commit '096a1d5b46391f65dfd0bee6292e9962f53bd7c8'

* commit '096a1d5b46391f65dfd0bee6292e9962f53bd7c8':
  rdft: Move some variables into a separate block

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

Merge commit 'b574e1e97ea7067a5fcd3876e30a67df0e4e6611'

* commit 'b574e1e97ea7067a5fcd3876e30a67df0e4e6611':
  get_bits: Add OPEN_READER macro variant w/o size_plus8

Conflicts:
libavcodec/get_bits.h

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

lavd/v4l2: simplify list_framesizes()

We can avoid passing file descriptor fd explicitely.

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

lavd/v4l2: remove unneeded variable in device_init()

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