ffplay: decrease max audio callbacks per second

Too many audio callbacks per second can cause buffer underruns especially under
load. As now we take into accound the elapsed time after an audio callback when
determining current audio clock, it is not that important to use small buffer
sizes and frequent audio callbacks, so lets remove the comment.

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

ffplay: calculate SDL audio buffer size based on sample rate

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

ffplay: pass simple integers to calculate_display_rect and set_default_window_size

No change in functionality.

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

ffplay: eliminate pictq_prev_picture

Instead of directly rolling back the frame queue, keep the last displayed
picture in the queue and use a boolean variable to keep track if it is
displayed or not. This makes the code cleaner because it removes the
complicated logic in pictq_prev_picture.

There should be no change in functionality.

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

avfilter/vf_deshake: fix macro ()

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

avfilter/vf_colormatrix: fix macro ()

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

mjpegdec: Properly set the context colorspace info

The JPEG spec requires it to be this.

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

avformat/nutdec: improve probe speed by 30%

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

avformat/wavenc: simplify malloc failure checking

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

avformat/wavenc: more specific error return for "Writing 16 bit peak for 8 bit audio"

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

avformat/wavenc: do not hardcode array size in memset and other functions

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

avformat/wavenc: use the bitexact flag from avformat instead of the one from avcodec

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

hevc/pps: optimized size of min_tb_addr_zs
reduce computation too
(cherry picked from commit 39c4d45c7788081c45c7fae51b7c5d0bcbaece9d)

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

avcodec/hevc_ps: remove min_cb_addr_zs

(cherry picked from commit ff7926d5092f9d4158108963e977e8c992322ba4)

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

Peak Envelope Chunk encoder: Indent

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

EBU Tech 3285 - Supplement 3 - Peak Envelope Chunk encoder

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

avfilter/vf_hqx: optimize table init

5389024880 -> 1389386610 dezicycles

This surely can be optimized more, i just didnt want to cause a slowdown
when trying to make the fate test bitexact.
Further optimization left to ubitux

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

avfilter/vf_hqx: avoid floats

this likely fixes fate failures

2748170880 -> 5389024880 dezicycles

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

avcodec/x86/h264_qpel_10bit: locally define pb_0

somehow old llvm-gcc manages to ignore the alignment from ff_pb_0 causing a crash on freebsd

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

avcodec/h264: do not leave ret random on minor failures, causing major failure

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

Merge commit '772d150a6e82542c06b0c251e73dd299d98d1027'

* commit '772d150a6e82542c06b0c251e73dd299d98d1027':
  h264: error out from decode_nal_units() when AV_EF_EXPLODE is set

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

Merge commit '10306e9c5fcc28bd9310a9b38f21540e9e1433e9'

* commit '10306e9c5fcc28bd9310a9b38f21540e9e1433e9':
  jpeg2000: fix dereferencing invalid pointers during cleanup

Conflicts:
libavcodec/jpeg2000.c

See: 09927f3eaa93e31dd90ab8ee66dc1ad867b3365f
See: 912ce9dd2080c5837285a471d750fa311e09b555
See: 9e477a37703318cb86d8ed1d426929235aa02b67
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'ab72eda15e98197cf148abc08574206cfde0d9b0'

* commit 'ab72eda15e98197cf148abc08574206cfde0d9b0':
  pixfmt: mark the reserved values

Conflicts:
libavutil/version.h

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

h264: error out from decode_nal_units() when AV_EF_EXPLODE is set

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

jpeg2000: fix dereferencing invalid pointers during cleanup

CC: libav-stable@libav.org
Found-by: Laurent Butti <laurentb@gmail.com>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

ffprobe: add color_range and color_space to stream output

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

avutil/lzo: allow selecting the compression function in the test code

libavcodec/wmalosslessdec: add missing emms

prevent failure with mmx2
should fix fate failure on freebsd mmx2 client

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

pixfmt: mark the reserved values

x86/dsputil: move put_signed_pixels_clamped out of bswapdsp.asm

It's still a dsputil function

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'fab9df63a3156ffe1f9490aafaea41e03ef60ddf'

* commit 'fab9df63a3156ffe1f9490aafaea41e03ef60ddf':
  dsputil: Split off global motion compensation bits into a separate context

Conflicts:
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/ppc/dsputil_altivec.h
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h

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

Merge commit 'f23d26a6864128001b03876b0b92fffe131f2060'

* commit 'f23d26a6864128001b03876b0b92fffe131f2060':
  h264: avoid using uninitialized memory in NEON chroma mc

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

dsputil: Split off global motion compensation bits into a separate context

h264: avoid using uninitialized memory in NEON chroma mc

Adapt commit 982b596ea6640bfe218a31f6c3fc542d9fe61c31 for the arm and
aarch64 NEON asm. 5-10% faster on Cortex-A9.

Merge commit 'ccda51b14c0fcae2fad73a24872dce75a7964996'

* commit 'ccda51b14c0fcae2fad73a24872dce75a7964996':
  lzo: Handle integer overflow

Conflicts:
libavutil/lzo.c

This is basically not merging changes due to this being fixed differently
in FFmpeg

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

avutil/lzo: add asserts to be double sure against overflows

These asserts cannot fail since d6af26c55c1ea30f85a7d9edbc373f53be1743ee

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

avutil/lzo: Fix integer overflow

Embargoed-till: 2014-06-27 requested by researcher, but embargo broken by libav today (git and mailing list)

Fixes: LMS-2014-06-16-4
Found-by: "Don A. Bailey" <donb@securitymouse.com>
See: ccda51b14c0fcae2fad73a24872dce75a7964996
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'e121ac634ba324a318f4a97f978dcfb48da6b735'

* commit 'e121ac634ba324a318f4a97f978dcfb48da6b735':
  indeo45: use is_indeo4 context flag instead of checking codec ID

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

Merge commit 'c67b449bebbe0b35c73b203683e77a0a649bc765'

* commit 'c67b449bebbe0b35c73b203683e77a0a649bc765':
  dsputil: Split bswap*_buf() off into a separate context

Conflicts:
configure
libavcodec/4xm.c
libavcodec/ac3dec.c
libavcodec/ac3dec.h
libavcodec/apedec.c
libavcodec/eamad.c
libavcodec/flacenc.c
libavcodec/fraps.c
libavcodec/huffyuv.c
libavcodec/huffyuvdec.c
libavcodec/motionpixels.c
libavcodec/truemotion2.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil_init.c

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

lzo: Handle integer overflow

get_len can overflow for specially crafted payload.

Reported-By: Don A. Baley <donb@securitymouse.com>
CC: libav-stable@libav.org

indeo45: use is_indeo4 context flag instead of checking codec ID

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>

Merge commit '7b9ef8d701c319c26f7d0664fe977e176764c74e'

* commit '7b9ef8d701c319c26f7d0664fe977e176764c74e':
  mpeg: Split error resilience bits off into a separate file

Conflicts:
configure
libavcodec/Makefile
libavcodec/mpegvideo.c

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

Merge commit 'f2f2e7627f0c878d13275af5d166ec5932665e28'

* commit 'f2f2e7627f0c878d13275af5d166ec5932665e28':
  Check mp3 header before calling avpriv_mpegaudio_decode_header().

Conflicts:
libavformat/mp3enc.c

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

Merge commit '44127546b0a81dc9dd6190739a62d48f0044c6f3'

* commit '44127546b0a81dc9dd6190739a62d48f0044c6f3':
  Check if an mp3 header is using a reserved sample rate.

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

dsputil: Split bswap*_buf() off into a separate context

mpeg: Split error resilience bits off into a separate file

Check mp3 header before calling avpriv_mpegaudio_decode_header().

As indicated in the function documentation, the header MUST be
checked prior to calling it because no consistency check is done
there.

CC:libav-stable@libav.org

Check if an mp3 header is using a reserved sample rate.

Fixes an invalid read past the end of avpriv_mpa_freq_tab.
Fixes divide-by-zero due to sample_rate being set to 0.

Bug-Id: 705

CC:libav-stable@libav.org

x86/dsputil: remove redundant global motion compensation code

The SSE version has been no different than the mmx one since commit a41bf09d

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/apedec: optimize sign combination

48078630 -> 32533850 dezi cycles

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

Merge commit '463a7cde563fd805864c48a76dd1b03fc24671ed'

* commit '463a7cde563fd805864c48a76dd1b03fc24671ed':
  Differentiate assembler and assembly in documentation and comments

Conflicts:
configure
doc/platform.texi

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

Merge commit '0ef256d51518f0e483c38b9ee3b993cf0709d00e'

* commit '0ef256d51518f0e483c38b9ee3b993cf0709d00e':
  libx264: Correctly manage constant rate factor params

Conflicts:
libavcodec/libx264.c

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

Merge commit '73953df71a28e94d8959facba7906cf5975ca4ef'

* commit '73953df71a28e94d8959facba7906cf5975ca4ef':
  Replace av_malloc() and memset(0) by av_mallocz()

Conflicts:
libavformat/matroskadec.c
libavformat/rmdec.c
libavformat/utils.c

No change, as none of the split malloc+memset existed in ffmpeg

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

Merge commit 'f83896abda1e78ebbbda0f184b682b4fabadc682'

* commit 'f83896abda1e78ebbbda0f184b682b4fabadc682':
  ape: Replace memset(0) by zero initialization

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

Merge commit '8d695dc411c1ae28477f107d6f7bf2db59af95df'

* commit '8d695dc411c1ae28477f107d6f7bf2db59af95df':
  mpeg: Mark ff_mpeg_set_erpic() static

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

Merge commit 'a6a675a79287565c3c23455439b114676b63a96c'

* commit 'a6a675a79287565c3c23455439b114676b63a96c':
  configure: Drop stray error resilience dependencies

Conflicts:
configure

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

Merge commit 'fbf4d2197f35bddccec00ad53185ee4ab81778a0'

* commit 'fbf4d2197f35bddccec00ad53185ee4ab81778a0':
  build: Record explicit dependency of intrax8 on error resilience

Conflicts:
configure

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

Merge commit 'c54e118722cbbdc04945538d1796d4472a1ff406'

* commit 'c54e118722cbbdc04945538d1796d4472a1ff406':
  build: Have the eatqi decoder depend on the MPEG-1 decoder

Conflicts:
configure

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

Merge commit '85d805d5cccb2f57e7f2e2254d7a870f05926cfd'

* commit '85d805d5cccb2f57e7f2e2254d7a870f05926cfd':
  build: Add missing object files for webm muxer

Conflicts:
libavformat/Makefile

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

Merge commit '03391b5432a2b8b8dbc3d2db722a54dfb68737b9'

* commit '03391b5432a2b8b8dbc3d2db722a54dfb68737b9':
  build: Add missing object files for Matroska demuxer

Conflicts:
libavcodec/Makefile
libavformat/Makefile

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

Merge commit '49470b9404583ab3aff6835f78a759349d331696'

* commit '49470b9404583ab3aff6835f78a759349d331696':
  build: Add missing replaygain object file for CAF demuxer

Conflicts:
libavformat/Makefile

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

ffmpeg: fix reinitializing with threads while flushing

With threads the decoder has a delay and will thus have multiple
frames at EOF left in its buffers which will be returned when flushing
the decoder. The code that extracts such frames from the decoder at the
end does not pull frames from the filtergraph, thus when one of these
frames causes the filtergraph to be reinited, the frames still inside
the graph at that point re lost

This commit changes the flushing to be more similar to normal decoding
and 1 frame at a time

Fixes hqx fate with threads

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

Differentiate assembler and assembly in documentation and comments

The language and the program that consumes the language are not the same.

ffmpeg: fix transcoding dvbsub to dvbsub

fix ticket #2024

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

avcodec/dvbsubdec: support returning exact end times

fixess part of ticket #2024

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

libx264: Correctly manage constant rate factor params

By default they are set to -1.

avfilter/vf_blend: fix macro ()

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

avfilter/unsharp_opencl: fix macro ()

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

x86/audiodsp: move asm code out of dsputil

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

drawtext: drop unused draw_glyphs() arg "rgbcolor"

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

Replace av_malloc() and memset(0) by av_mallocz()

ape: Replace memset(0) by zero initialization

Merge commit '9a9e2f1c8aa4539a261625145e5c1f46a8106ac2'

* commit '9a9e2f1c8aa4539a261625145e5c1f46a8106ac2':
  dsputil: Split audio operations off into a separate context

Conflicts:
configure
libavcodec/takdec.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil.asm
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h

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

mpeg: Mark ff_mpeg_set_erpic() static

It is not used outside of the file.

configure: Drop stray error resilience dependencies

build: Record explicit dependency of intrax8 on error resilience

build: Have the eatqi decoder depend on the MPEG-1 decoder

eatqi uses more than just the shared mpegvideo bits.

build: Add missing object files for webm muxer

build: Add missing object files for Matroska demuxer

build: Add missing replaygain object file for CAF demuxer

dsputil: Split audio operations off into a separate context

swr: remove another forgotten division in DSP function.

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

avfilter/vf_hqx: remove << 0

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

fate/filter-video: fix hqx on big endian part 2

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

avfilter/vf_hqx: partly fix big endian fate test

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

swscale/x86/input: prevent RGB32_TO_Y_FN from reading into the padding

This avoids reading uninitialized bytes and confusing valgrind

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

swscale/x86/input: prevent RGB32_TO_UV_FN from reading into the padding

This avoids reading uninitialized bytes and confusing valgrind

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

avfilter/deshake_opencl: fix macro ()

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

avfilter/avf_showspectrum: fix macro ()

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

avfilter/hqx: add some self promotion in doxy.

This is useful to understand how it's different from the original code.

avfilter/hqx: unroll the pattern calculation

Code si smaller, no speed difference.

avformat/flvdec: give live_flvdec a separate name

This should fix a infinite loop on freebsd

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

Show duration for large asf files as written in the file header.

Fixes ticket #3428.

Do not show libzvbi in the configure output if it was not enabled.

It is already shown in the list of external libraries if it was enabled.

avfilter: add hqx filter (hq2x, hq3x, hq4x)

Partially fixes Ticket #3404 (xbr filter remaining)

avcodec/libtwolame: fix encoding lsf with defaults

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

avcodec/bitstream: document the double volatile

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

ffmpeg: fix memleak and corruption of AVSubtitle with multiple outputs

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

build: Add missing object file for Matroska demuxer

Fixes compilation with --disable-everything --disable-network --enable-demuxer=matroska

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>

avcodec/ituh263enc: fix advanced intra coding

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