]> git.sesse.net Git - ffmpeg/log
ffmpeg
9 years agoavfilter/vf_lut3d: Change enum to int, which is accessed via AVOption as int
Michael Niedermayer [Wed, 18 Mar 2015 11:26:15 +0000 (12:26 +0100)]
avfilter/vf_lut3d: Change enum to int, which is accessed via AVOption as int

This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter/vf_il: Change enums to int, which are accessed via AVOption as int
Michael Niedermayer [Wed, 18 Mar 2015 11:25:18 +0000 (12:25 +0100)]
avfilter/vf_il: Change enums to int, which are accessed via AVOption as int

This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter/vf_histogram: Change enum to int, which is accessed via AVOption as int
Michael Niedermayer [Wed, 18 Mar 2015 11:23:39 +0000 (12:23 +0100)]
avfilter/vf_histogram: Change enum to int, which is accessed via AVOption as int

This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavfi: add showwavespic filter
Clément Bœsch [Wed, 24 Dec 2014 14:03:26 +0000 (15:03 +0100)]
lavfi: add showwavespic filter

This is a variant of showwaves. It is implemented as a different filter
so that the user is not allowed to use meaningless options which belong
to showwaves (such as rate).

Major edits done by Stefano Sabatini, from a patch by ubitux.

See thread:
From: Clément Bœsch <u@pkh.me>
To: ffmpeg-devel@ffmpeg.org
Date: Wed, 24 Dec 2014 15:03:26 +0100
Subject: [FFmpeg-devel] [PATCH] avfilter/showwaves: add single_pic option

9 years agoReplace PixelFormats which sneaked in over time or where forgotten by AVPixelFormats
Michael Niedermayer [Wed, 18 Mar 2015 00:18:40 +0000 (01:18 +0100)]
Replace PixelFormats which sneaked in over time or where forgotten by AVPixelFormats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '58a840e21577a2168843487a98cb2cea44b5a94a'
Michael Niedermayer [Wed, 18 Mar 2015 00:01:30 +0000 (01:01 +0100)]
Merge commit '58a840e21577a2168843487a98cb2cea44b5a94a'

* commit '58a840e21577a2168843487a98cb2cea44b5a94a':
  Replace a few leftover instances of enum PixelFormat with enum AVPixelFormat

See: ac627b3d38d370027406c93c2dcaac0b1712a7d4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/ac3dec_fixed: fix compilation when ac3dec is disabled
James Almer [Tue, 17 Mar 2015 20:02:16 +0000 (17:02 -0300)]
avcodec/ac3dec_fixed: fix compilation when ac3dec is disabled

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
9 years agoavcodec/aacsbr: Replace impossible condition by assert
Michael Niedermayer [Tue, 17 Mar 2015 21:39:01 +0000 (22:39 +0100)]
avcodec/aacsbr: Replace impossible condition by assert

bits can have a value of 0 or 1 they are never -1 or otherwise negative

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoReplace a few leftover instances of enum PixelFormat with enum AVPixelFormat
Martin Storsjö [Tue, 17 Mar 2015 12:40:40 +0000 (14:40 +0200)]
Replace a few leftover instances of enum PixelFormat with enum AVPixelFormat

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoMerge commit '6289706b35d1b030258bba54cc27bb6d2c04bc9b'
Michael Niedermayer [Tue, 17 Mar 2015 20:58:16 +0000 (21:58 +0100)]
Merge commit '6289706b35d1b030258bba54cc27bb6d2c04bc9b'

* commit '6289706b35d1b030258bba54cc27bb6d2c04bc9b':
  fate: Move tdsc to the appropriate screen capture file

Conflicts:
tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '423f5d50e499ab972f507115700c8f31ed8993e4'
Michael Niedermayer [Tue, 17 Mar 2015 20:43:39 +0000 (21:43 +0100)]
Merge commit '423f5d50e499ab972f507115700c8f31ed8993e4'

* commit '423f5d50e499ab972f507115700c8f31ed8993e4':
  mov: Fix little endian audio detection

Conflicts:
libavformat/mov.c

See: d2549ba9df1a1aac8c0ae19bfca2c81e508ba02e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'cdce9e8025fff1dee2fd3d6bc28aebc0a330c5a0'
Michael Niedermayer [Tue, 17 Mar 2015 20:26:11 +0000 (21:26 +0100)]
Merge commit 'cdce9e8025fff1dee2fd3d6bc28aebc0a330c5a0'

* commit 'cdce9e8025fff1dee2fd3d6bc28aebc0a330c5a0':
  aacsbr: Fix type for index variable

See: a15adabdd32c8736c143fcbef36a0f4a75f772f0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '7c60c124c8dfaebfafa2b3c11b316db549617732'
Michael Niedermayer [Tue, 17 Mar 2015 20:18:19 +0000 (21:18 +0100)]
Merge commit '7c60c124c8dfaebfafa2b3c11b316db549617732'

* commit '7c60c124c8dfaebfafa2b3c11b316db549617732':
  hqx: Drop unused offsets table

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '4326bc364b58e97fc3d89417054a6b7610179a00'
Michael Niedermayer [Tue, 17 Mar 2015 20:08:12 +0000 (21:08 +0100)]
Merge commit '4326bc364b58e97fc3d89417054a6b7610179a00'

* commit '4326bc364b58e97fc3d89417054a6b7610179a00':
  lavf: Do not list mov-only codecs in riff tags

Conflicts:
libavformat/Makefile
libavformat/avidec.c

See: 2e0b5f5c90a4bc1440703ba5e8bf7139ff42f367
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'cf9861dea5d42d0b5a6cf0609b9624525d96c1e0'
Michael Niedermayer [Tue, 17 Mar 2015 19:55:47 +0000 (20:55 +0100)]
Merge commit 'cf9861dea5d42d0b5a6cf0609b9624525d96c1e0'

* commit 'cf9861dea5d42d0b5a6cf0609b9624525d96c1e0':
  isom: Add X-Com Radvision FourCC

See: ac494e5a66507c8124e8ba399b3f0685a51d7a82
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '02d76141d68e38c80f9a205a56b9af10d74f0995'
Michael Niedermayer [Tue, 17 Mar 2015 19:48:39 +0000 (20:48 +0100)]
Merge commit '02d76141d68e38c80f9a205a56b9af10d74f0995'

* commit '02d76141d68e38c80f9a205a56b9af10d74f0995':
  riff: Add 'tshd' FourCC for H.264

Conflicts:
libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'c0f504e947cc0a3c73770419bf7d1af98288fc59'
Michael Niedermayer [Tue, 17 Mar 2015 19:39:34 +0000 (20:39 +0100)]
Merge commit 'c0f504e947cc0a3c73770419bf7d1af98288fc59'

* commit 'c0f504e947cc0a3c73770419bf7d1af98288fc59':
  libx264: Allow full-range yuv422 and yuv444 pixel formats

See: 79209f5d6ca31c73260f1c5f5dbaa8395102d9f1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'c9ed48e80ef807ab0c1bb946ac8db5f34d83d9c9'
Michael Niedermayer [Tue, 17 Mar 2015 19:32:46 +0000 (20:32 +0100)]
Merge commit 'c9ed48e80ef807ab0c1bb946ac8db5f34d83d9c9'

* commit 'c9ed48e80ef807ab0c1bb946ac8db5f34d83d9c9':
  dca: Read params->pancABIT0[param_index] only if part0 is set

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '48aef27f5232794e70ecef0d347b9f65e27a9bad'
Michael Niedermayer [Tue, 17 Mar 2015 19:14:48 +0000 (20:14 +0100)]
Merge commit '48aef27f5232794e70ecef0d347b9f65e27a9bad'

* commit '48aef27f5232794e70ecef0d347b9f65e27a9bad':
  x86: Put COPY3_IF_LT under HAVE_6REGS

Conflicts:
libavcodec/x86/mathops.h

See: b38910c9790253b362839042a17e13252c1d4b90
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter/vf_colormatrix: make sure the number of threads is even for yuv420p
Clément Bœsch [Tue, 17 Mar 2015 19:09:49 +0000 (20:09 +0100)]
avfilter/vf_colormatrix: make sure the number of threads is even for yuv420p

Fix crash with for example:
  ffmpeg -f lavfi -i testsrc=568x320 -threads 3 -vf format=yuv420p,colormatrix=bt709:smpte170m -f null -

9 years agoMerge commit '96dd04427fc46e5e25a5ac1f00753207e3aedb0c'
Michael Niedermayer [Tue, 17 Mar 2015 19:05:33 +0000 (20:05 +0100)]
Merge commit '96dd04427fc46e5e25a5ac1f00753207e3aedb0c'

* commit '96dd04427fc46e5e25a5ac1f00753207e3aedb0c':
  isom: Add support for TSCC2

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '91894f27dce531c13d7e1be20253877f2e1e9e66'
Michael Niedermayer [Tue, 17 Mar 2015 18:52:14 +0000 (19:52 +0100)]
Merge commit '91894f27dce531c13d7e1be20253877f2e1e9e66'

* commit '91894f27dce531c13d7e1be20253877f2e1e9e66':
  configure: Disable shift operator precedence warnings with MSVC

Conflicts:
configure

See: 9e208ce6dd94596b4185a93af4aab3dcd28eb5b7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/mov: fix mis-detection of jpeg2000
Michael Niedermayer [Tue, 17 Mar 2015 17:56:24 +0000 (18:56 +0100)]
avformat/mov: fix mis-detection of jpeg2000

Fixes demuxer choice for Ticket 2792

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter/vf_histeq: Change enums to int, which are accessed via AVOption as int
Michael Niedermayer [Tue, 17 Mar 2015 16:13:38 +0000 (17:13 +0100)]
avfilter/vf_histeq: Change enums to int, which are accessed via AVOption as int

This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter/vf_fieldmatch: Change enums to int, which are accessed via AVOption as int
Michael Niedermayer [Tue, 17 Mar 2015 16:11:42 +0000 (17:11 +0100)]
avfilter/vf_fieldmatch: Change enums to int, which are accessed via AVOption as int

This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter/vf_field: Change enum to int, which is accessed via AVOption as int
Michael Niedermayer [Tue, 17 Mar 2015 15:52:10 +0000 (16:52 +0100)]
avfilter/vf_field: Change enum to int, which is accessed via AVOption as int

This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agomxfenc: fix memleaks in mxf_write_footer
Andreas Cadhalpun [Sat, 14 Mar 2015 16:47:53 +0000 (17:47 +0100)]
mxfenc: fix memleaks in mxf_write_footer

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Reviewed-by: tomas.hardin@codemill.se
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodoc/protocols: Fixed missing example section marker
Tobias Rapp [Wed, 11 Mar 2015 10:22:04 +0000 (11:22 +0100)]
doc/protocols: Fixed missing example section marker

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agofate: Move tdsc to the appropriate screen capture file
Vittorio Giovara [Mon, 16 Mar 2015 13:09:50 +0000 (13:09 +0000)]
fate: Move tdsc to the appropriate screen capture file

9 years agomov: Fix little endian audio detection
Vittorio Giovara [Fri, 13 Mar 2015 19:45:14 +0000 (19:45 +0000)]
mov: Fix little endian audio detection

Set this field to TRUE if the audio component is to operate on
little-endian data, and FALSE otherwise.

However TRUE and FALSE are not defined. Since this flag is just a boolean,
interpret all values except for 0 as little endian.

Sample-Id: 64bit_FLOAT_Little_Endian.mov

9 years agoaacsbr: Fix type for index variable
Vittorio Giovara [Wed, 11 Mar 2015 19:25:00 +0000 (19:25 +0000)]
aacsbr: Fix type for index variable

Prevents unsigned overflow and variable truncation.

Bug-Id: CID 603186

9 years agohqx: Drop unused offsets table
Vittorio Giovara [Mon, 16 Mar 2015 13:40:35 +0000 (13:40 +0000)]
hqx: Drop unused offsets table

This is a leftover from the static to dynamic vlc table conversion.

9 years agolavf: Do not list mov-only codecs in riff tags
Carl Eugen Hoyos [Mon, 16 Mar 2015 11:58:29 +0000 (11:58 +0000)]
lavf: Do not list mov-only codecs in riff tags

Instead check for all mov code-points when demuxing avi
and print a warning if a video codec is found like this.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
9 years agoisom: Add X-Com Radvision FourCC
Paul B Mahol [Mon, 16 Mar 2015 10:42:39 +0000 (10:42 +0000)]
isom: Add X-Com Radvision FourCC

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agoriff: Add 'tshd' FourCC for H.264
Vittorio Giovara [Mon, 16 Mar 2015 10:34:12 +0000 (10:34 +0000)]
riff: Add 'tshd' FourCC for H.264

9 years agolibx264: Allow full-range yuv422 and yuv444 pixel formats
Carl Eugen Hoyos [Tue, 17 Mar 2015 13:29:05 +0000 (13:29 +0000)]
libx264: Allow full-range yuv422 and yuv444 pixel formats

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
9 years agodca: Read params->pancABIT0[param_index] only if part0 is set
Niels Möller [Mon, 16 Mar 2015 21:31:41 +0000 (22:31 +0100)]
dca: Read params->pancABIT0[param_index] only if part0 is set

Prevent a spurious read from uninitialized memory.

9 years agox86: Put COPY3_IF_LT under HAVE_6REGS
Luca Barbato [Mon, 16 Mar 2015 10:26:48 +0000 (11:26 +0100)]
x86: Put COPY3_IF_LT under HAVE_6REGS

It uses 6 registers, unbreaks building on hardened x86 system.

Bug-Id: gentoo/541930
CC: libav-stable@libav.org
9 years agoisom: Add support for TSCC2
Luca Barbato [Mon, 16 Mar 2015 13:18:45 +0000 (14:18 +0100)]
isom: Add support for TSCC2

As produced by Camtasia 4.

9 years agoconfigure: Disable shift operator precedence warnings with MSVC
Diego Biurrun [Sun, 15 Mar 2015 14:55:03 +0000 (15:55 +0100)]
configure: Disable shift operator precedence warnings with MSVC

9 years agoavcodec/vc1_pred: Fix undefined shifts
Michael Niedermayer [Tue, 17 Mar 2015 00:51:59 +0000 (01:51 +0100)]
avcodec/vc1_pred: Fix undefined shifts

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/libx264: use AVERROR_EXTERNAL instead of AVERROR_UNKNOWN
Clément Bœsch [Mon, 16 Mar 2015 23:05:58 +0000 (00:05 +0100)]
avcodec/libx264: use AVERROR_EXTERNAL instead of AVERROR_UNKNOWN

9 years agoavfilter: handle error in query_formats() of a bunch of random video filters
Clément Bœsch [Sun, 15 Mar 2015 13:20:34 +0000 (14:20 +0100)]
avfilter: handle error in query_formats() of a bunch of random video filters

9 years agoavfilter/formats: proper error handling in ff_set_common_*() functions
Clément Bœsch [Sun, 15 Mar 2015 12:24:22 +0000 (13:24 +0100)]
avfilter/formats: proper error handling in ff_set_common_*() functions

9 years agoavfilter/formats: proper error handling in ff_channel_layouts_ref() and ff_formats_ref()
Clément Bœsch [Sat, 14 Mar 2015 20:21:49 +0000 (21:21 +0100)]
avfilter/formats: proper error handling in ff_channel_layouts_ref() and ff_formats_ref()

Also make sure the allocation and its check are properly done.

9 years agoavfilter/formats: use av_realloc_array in ADD_FORMAT()
Clément Bœsch [Sat, 14 Mar 2015 20:17:27 +0000 (21:17 +0100)]
avfilter/formats: use av_realloc_array in ADD_FORMAT()

9 years agoavfilter/formats: remove unused COPY_INT_LIST() macro
Clément Bœsch [Sat, 14 Mar 2015 20:14:46 +0000 (21:14 +0100)]
avfilter/formats: remove unused COPY_INT_LIST() macro

This macro is unused since 247fa6c27c4589d0f7a427c520d782edbb6de060.

9 years agoMerge commit '2cb9c2fc59c9267ad2631c07c81c188058502259'
Michael Niedermayer [Mon, 16 Mar 2015 22:30:13 +0000 (23:30 +0100)]
Merge commit '2cb9c2fc59c9267ad2631c07c81c188058502259'

* commit '2cb9c2fc59c9267ad2631c07c81c188058502259':
  movenc: Allow interleaving samples when writing fragmented files

Conflicts:
libavformat/movenc.c
libavformat/movenc.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoOpenCL uninit bug fix - clear is_compiled flag
srikanth [Mon, 9 Mar 2015 22:34:49 +0000 (17:34 -0500)]
OpenCL uninit bug fix - clear is_compiled flag

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/rtsp: Fix potential pointer overflow in sdp_probe()
Michael Niedermayer [Mon, 16 Mar 2015 21:40:36 +0000 (22:40 +0100)]
avformat/rtsp: Fix potential pointer overflow in sdp_probe()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/mpegts: Fix potential pointer overflows
Michael Niedermayer [Mon, 16 Mar 2015 21:37:46 +0000 (22:37 +0100)]
avformat/mpegts: Fix potential pointer overflows

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoconfigure: Silence EMMS warnings in ICC
Michael Niedermayer [Mon, 16 Mar 2015 14:38:36 +0000 (15:38 +0100)]
configure: Silence EMMS warnings in ICC

Real world MMX code does not put EMMS at the start and end of every function,
it would be incredibly inefficient to do that
thus do not warn about that

Tested-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '50ff0c05b691524d1fd044a2f2eefb706932fc98'
Michael Niedermayer [Mon, 16 Mar 2015 20:52:54 +0000 (21:52 +0100)]
Merge commit '50ff0c05b691524d1fd044a2f2eefb706932fc98'

* commit '50ff0c05b691524d1fd044a2f2eefb706932fc98':
  movenc: Support writing multiple trun atoms

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'faab8f9fcb4ffeb967dc6872c0f1e9da719106ce'
Michael Niedermayer [Mon, 16 Mar 2015 20:46:02 +0000 (21:46 +0100)]
Merge commit 'faab8f9fcb4ffeb967dc6872c0f1e9da719106ce'

* commit 'faab8f9fcb4ffeb967dc6872c0f1e9da719106ce':
  configure: move cross_compile checks after the toolchain section

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '3e1b5cbc9ab0a61c9bec08a1df1404b9da6ed7ea'
Michael Niedermayer [Mon, 16 Mar 2015 20:34:03 +0000 (21:34 +0100)]
Merge commit '3e1b5cbc9ab0a61c9bec08a1df1404b9da6ed7ea'

* commit '3e1b5cbc9ab0a61c9bec08a1df1404b9da6ed7ea':
  configure: handle Apple's armv7s in probe_arm_arch()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'f01c77157789b8e3a59ed2c9646faf8299e41641'
Michael Niedermayer [Mon, 16 Mar 2015 20:26:58 +0000 (21:26 +0100)]
Merge commit 'f01c77157789b8e3a59ed2c9646faf8299e41641'

* commit 'f01c77157789b8e3a59ed2c9646faf8299e41641':
  fate: add explicit support for the toolchain configure option

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'a9d60c390f35f3954821bd635fd31bbb5036b29d'
Michael Niedermayer [Mon, 16 Mar 2015 20:19:29 +0000 (21:19 +0100)]
Merge commit 'a9d60c390f35f3954821bd635fd31bbb5036b29d'

* commit 'a9d60c390f35f3954821bd635fd31bbb5036b29d':
  doc: fate: remove outdated SSH key fingerprint

Conflicts:
doc/fate.texi

Not merged, this does not apply to our servers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agohevc: avoid unnecessary calls to get_format
Rainer Hochecker [Thu, 12 Mar 2015 13:08:24 +0000 (14:08 +0100)]
hevc: avoid unnecessary calls to get_format

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/cavsvideodec: use avpriv_find_start_code in cavsvideo_probe()
zhaoxiu.zeng [Sun, 15 Mar 2015 08:56:04 +0000 (16:56 +0800)]
avformat/cavsvideodec: use avpriv_find_start_code in cavsvideo_probe()

Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/x86/cavsdsp: remove incorrect LOCAL_ALIGN tmp
Michael Niedermayer [Mon, 16 Mar 2015 13:28:11 +0000 (14:28 +0100)]
avcodec/x86/cavsdsp: remove incorrect LOCAL_ALIGN tmp

This is faster and simpler as well

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/hevc: Fix undefined shifts
Michael Niedermayer [Mon, 16 Mar 2015 13:27:11 +0000 (14:27 +0100)]
avcodec/hevc: Fix undefined shifts

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/tdsc: Remove ;;
Michael Niedermayer [Mon, 16 Mar 2015 12:04:47 +0000 (13:04 +0100)]
avcodec/tdsc: Remove ;;

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/hls: refactor repeated HLS option updates
Micah Galizia [Mon, 16 Mar 2015 09:26:29 +0000 (20:26 +1100)]
avformat/hls: refactor repeated HLS option updates

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agomovenc: Allow interleaving samples when writing fragmented files
Martin Storsjö [Tue, 10 Sep 2013 12:35:41 +0000 (15:35 +0300)]
movenc: Allow interleaving samples when writing fragmented files

This is incompatible with the omit_tfhd_offset flag (writing
position independent fragments with interleaving requires the
default_base_moof flag).

This makes the moof atoms slightly bigger, but can be better for
playback (improving locality of sample data in the mdat).

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agomovenc: Support writing multiple trun atoms
Martin Storsjö [Tue, 10 Sep 2013 12:24:24 +0000 (15:24 +0300)]
movenc: Support writing multiple trun atoms

This is needed if all the data for one track isn't continuous
within the mdat. Normally we make sure all the data for one
track is continuous, but in new cases we will need to have
the samples interleaved.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoconfigure: move cross_compile checks after the toolchain section
Janne Grunau [Thu, 26 Feb 2015 20:54:55 +0000 (21:54 +0100)]
configure: move cross_compile checks after the toolchain section

9 years agoconfigure: handle Apple's armv7s in probe_arm_arch()
Janne Grunau [Wed, 25 Feb 2015 17:16:52 +0000 (18:16 +0100)]
configure: handle Apple's armv7s in probe_arm_arch()

9 years agofate: add explicit support for the toolchain configure option
Janne Grunau [Thu, 26 Feb 2015 21:04:12 +0000 (22:04 +0100)]
fate: add explicit support for the toolchain configure option

9 years agodoc: fate: remove outdated SSH key fingerprint
Janne Grunau [Mon, 9 Mar 2015 22:19:55 +0000 (23:19 +0100)]
doc: fate: remove outdated SSH key fingerprint

9 years agoMerge commit '66a0ac0a802dd794acc1ab8559d3db9e98755b57'
Michael Niedermayer [Mon, 16 Mar 2015 10:36:43 +0000 (11:36 +0100)]
Merge commit '66a0ac0a802dd794acc1ab8559d3db9e98755b57'

* commit '66a0ac0a802dd794acc1ab8559d3db9e98755b57':
  mkv: Add support for DVB subtitles

See: 4789c25d83c4a90e8ef81d2cc05be6d2f12dfa68
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavfi/sendcmd: improve error reporting and robustness in case of missing commands
Stefano Sabatini [Mon, 16 Mar 2015 09:41:19 +0000 (10:41 +0100)]
lavfi/sendcmd: improve error reporting and robustness in case of missing commands

In particular, fix crash with -vf sendcmd, when no arguments are provided.

9 years agox86/proresdsp: remove ff_prores_idct_put_10_sse4
James Almer [Sun, 15 Mar 2015 18:03:54 +0000 (15:03 -0300)]
x86/proresdsp: remove ff_prores_idct_put_10_sse4

It's exactly the same as the sse2 version.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
9 years agox86/proresdsp: remove unused macro
James Almer [Sun, 15 Mar 2015 17:56:13 +0000 (14:56 -0300)]
x86/proresdsp: remove unused macro

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
9 years agoavformat/mov: Disallow ".." in dref unless use_absolute_path is set
Michael Niedermayer [Sat, 14 Mar 2015 20:32:35 +0000 (21:32 +0100)]
avformat/mov: Disallow ".." in dref unless use_absolute_path is set

as this kind of allows to circumvent it to some extend.
We also could add a separate parameter or value to choose this

Found-by: ramiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibavformat/mxfdec: fix MXFPackage->comment_refs memory leak
Mark Reid [Sun, 15 Mar 2015 21:43:32 +0000 (14:43 -0700)]
libavformat/mxfdec: fix MXFPackage->comment_refs memory leak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/hls: store cookies returned in HLS key response
Micah Galizia [Sat, 14 Mar 2015 22:31:59 +0000 (09:31 +1100)]
avformat/hls: store cookies returned in HLS key response

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/dcadec: if XLL is enabled use xll channels
Michael Niedermayer [Mon, 16 Mar 2015 00:19:18 +0000 (01:19 +0100)]
avcodec/dcadec: if XLL is enabled use xll channels

Fixes outputting 14 channels instead of 7

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/dcadec: Only upsample as much data as is there
Michael Niedermayer [Sun, 15 Mar 2015 23:44:54 +0000 (00:44 +0100)]
avcodec/dcadec: Only upsample as much data as is there

Found-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '9a60b1fad02cb783b895b2145c3dafc01f7b337c'
Michael Niedermayer [Sun, 15 Mar 2015 23:14:30 +0000 (00:14 +0100)]
Merge commit '9a60b1fad02cb783b895b2145c3dafc01f7b337c'

* commit '9a60b1fad02cb783b895b2145c3dafc01f7b337c':
  libswscale: fix compiler warnings enumerated type mixed with another type

Conflicts:
libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '66028b7ba6b411ba12ef553e9c8f1f4a4fe27710'
Michael Niedermayer [Sun, 15 Mar 2015 22:25:33 +0000 (23:25 +0100)]
Merge commit '66028b7ba6b411ba12ef553e9c8f1f4a4fe27710'

* commit '66028b7ba6b411ba12ef553e9c8f1f4a4fe27710':
  udp: Use AVOptions

Conflicts:
libavformat/udp.c

See: aefed6ca87971a9d277157c92fef4cdd42c5c1e2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agomkv: Add support for DVB subtitles
Luca Barbato [Sun, 15 Mar 2015 22:49:17 +0000 (23:49 +0100)]
mkv: Add support for DVB subtitles

Bug-Id: 833

9 years agoMerge commit 'a4c5801070198c1f2af32fa5cf850c330615ac24'
Michael Niedermayer [Sun, 15 Mar 2015 21:41:35 +0000 (22:41 +0100)]
Merge commit 'a4c5801070198c1f2af32fa5cf850c330615ac24'

* commit 'a4c5801070198c1f2af32fa5cf850c330615ac24':
  sctp: Update to match tcp

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'acbe15a99f158dbb0edb837fb6557171dc4376d4'
Michael Niedermayer [Sun, 15 Mar 2015 21:20:15 +0000 (22:20 +0100)]
Merge commit 'acbe15a99f158dbb0edb837fb6557171dc4376d4'

* commit 'acbe15a99f158dbb0edb837fb6557171dc4376d4':
  fate: Add test for DCA XLL

Conflicts:
tests/fate/audio.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '217e4ff4d1f845b76e44634e29371cd09313d1c2'
Michael Niedermayer [Sun, 15 Mar 2015 20:44:06 +0000 (21:44 +0100)]
Merge commit '217e4ff4d1f845b76e44634e29371cd09313d1c2'

* commit '217e4ff4d1f845b76e44634e29371cd09313d1c2':
  dca: Support for XLL (lossless extension)

Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/dca.h
libavcodec/dca_exss.c
libavcodec/dcadata.h
libavcodec/dcadec.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '4da5aacc7eba274a4f18411120de539d39c5151e'
Michael Niedermayer [Sun, 15 Mar 2015 20:14:39 +0000 (21:14 +0100)]
Merge commit '4da5aacc7eba274a4f18411120de539d39c5151e'

* commit '4da5aacc7eba274a4f18411120de539d39c5151e':
  dca: Mark syncword constants unsigned; they do not fit in 32-bit signed int

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/dvbsub_parser: Fix potential pointer overflows
Michael Niedermayer [Sun, 15 Mar 2015 17:20:58 +0000 (18:20 +0100)]
avcodec/dvbsub_parser: Fix potential pointer overflows

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter/palettegen: make sure at least one frame was sent to the filter
Clément Bœsch [Sun, 15 Mar 2015 18:09:16 +0000 (19:09 +0100)]
avfilter/palettegen: make sure at least one frame was sent to the filter

Fix FPE.

9 years agolibswscale: fix compiler warnings enumerated type mixed with another type
Himangi Saraogi [Sat, 14 Mar 2015 15:52:25 +0000 (21:22 +0530)]
libswscale: fix compiler warnings enumerated type mixed with another type

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
9 years agoudp: Use AVOptions
Luca Barbato [Fri, 13 Mar 2015 16:00:12 +0000 (17:00 +0100)]
udp: Use AVOptions

Add AVOptions for options currently available as url parameters.

9 years agosctp: Update to match tcp
Luca Barbato [Fri, 13 Mar 2015 13:33:41 +0000 (14:33 +0100)]
sctp: Update to match tcp

Use AVOption and fallback over multiple addresses

9 years agoavcodec/h264dsp_template: Fix undefined shifts
Michael Niedermayer [Sun, 15 Mar 2015 16:30:10 +0000 (17:30 +0100)]
avcodec/h264dsp_template: Fix undefined shifts

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibavformat/mxfenc: write user comment metadata
Mark Reid [Sun, 15 Mar 2015 00:59:50 +0000 (17:59 -0700)]
libavformat/mxfenc: write user comment metadata

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavfi/eq: clarify error message in case of expression parsing error
Stefano Sabatini [Sun, 15 Mar 2015 13:26:51 +0000 (14:26 +0100)]
lavfi/eq: clarify error message in case of expression parsing error

9 years agofate: Add test for DCA XLL
Diego Biurrun [Wed, 18 Feb 2015 23:05:22 +0000 (00:05 +0100)]
fate: Add test for DCA XLL

9 years agodca: Support for XLL (lossless extension)
Niels Möller [Tue, 11 Feb 2014 10:45:27 +0000 (11:45 +0100)]
dca: Support for XLL (lossless extension)

Cleanup and integration by Diego Biurrun.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
9 years agoavformat/dvbsub: Fix hypothetical pointer overflow in dvbsub_probe()
Michael Niedermayer [Sun, 15 Mar 2015 12:45:31 +0000 (13:45 +0100)]
avformat/dvbsub: Fix hypothetical pointer overflow in dvbsub_probe()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/mpegvideodec: fix hypothetical pointer overflow in mpegvideo_probe()
Michael Niedermayer [Sun, 15 Mar 2015 12:39:56 +0000 (13:39 +0100)]
avformat/mpegvideodec: fix hypothetical pointer overflow in mpegvideo_probe()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/mpegvideodec: use avpriv_find_start_code in mpegvideo_probe()
zhaoxiu.zeng [Sun, 15 Mar 2015 08:46:22 +0000 (16:46 +0800)]
avformat/mpegvideodec: use avpriv_find_start_code in mpegvideo_probe()

Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/avidec: cleanup include
zhaoxiu.zeng [Sun, 15 Mar 2015 08:38:27 +0000 (16:38 +0800)]
avformat/avidec: cleanup include

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/avidec: use avpriv_find_start_code in avi_read_packet()
zhaoxiu.zeng [Sun, 15 Mar 2015 08:38:27 +0000 (16:38 +0800)]
avformat/avidec: use avpriv_find_start_code in avi_read_packet()

Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>