chromium/third_party/ffmpeg.git
13 days agoavformat/os_support: Add _DEFAULT_SOURCE to hide warning about _SVID_SOURCE depreciation 06/71806/3 master
Daniel Bomar [Fri, 19 Sep 2014 19:56:00 +0000 (14:56 -0500)]
avformat/os_support: Add _DEFAULT_SOURCE to hide warning about _SVID_SOURCE depreciation

As suggested, this just adds _DEFAULT_SOURCE while preserving
_SVID_SOURCE for whatever old systems still need it.

Signed-off-by: Daniel Bomar <dbdaniel42@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
BUG=420149
Change-Id: Ic755e1faf1c37a8d00cfca08cc58c181b7eada10

2 weeks agoAdd linux-noasm configs for ChromiumOS, ChromeOS. 95/71795/1
Sergey Matveev [Fri, 10 Oct 2014 18:34:29 +0000 (22:34 +0400)]
Add linux-noasm configs for ChromiumOS, ChromeOS.

Those were not being generated due to an oversight.

BUG=340376
R=dalecurtis@chromium.org

3 weeks agoFix os_config of ffmpeg_options.gni for ChromeOS. 04/71704/1
Jun Mukai [Wed, 1 Oct 2014 17:58:21 +0000 (10:58 -0700)]
Fix os_config of ffmpeg_options.gni for ChromeOS.

ChromeOS needs to use "linux".

4 weeks agoUpdate config files for MIPS Linux 67/71667/1
Petar Jovanovic [Thu, 25 Sep 2014 22:36:17 +0000 (00:36 +0200)]
Update config files for MIPS Linux

Recent update to FFmpeg config broke the build of Chromium for MIPS.
This change is a result of two commands:

$ ./chromium/scripts/build_ffmpeg.py linux mipsel
$ ./chromium/scripts/copy_config.sh

BUG= regression build issue
TEST= build Chromium for MIPS Linux

4 weeks agoMerge "Rename direct_dependent_configs in GN build"
Brett Wilson [Wed, 24 Sep 2014 18:05:37 +0000 (11:05 -0700)]
Merge "Rename direct_dependent_configs in GN build"

4 weeks agoRename direct_dependent_configs in GN build 52/71652/1
Brett Wilson [Wed, 24 Sep 2014 17:45:08 +0000 (10:45 -0700)]
Rename direct_dependent_configs in GN build

4 weeks agoRemove t2h.pm helper script pending GPLv3 license additions.
Dale Curtis [Tue, 23 Sep 2014 22:16:38 +0000 (15:16 -0700)]
Remove t2h.pm helper script pending GPLv3 license additions.

This file is unused by Chrome yet adds a GPLv3 license which flags
detection by checklicenses.  Remove pending discussion with the
lawyercats on whether its okay to have this.

4 weeks agoUpdate README.chromium for merge.
Dale Curtis [Tue, 23 Sep 2014 17:17:54 +0000 (10:17 -0700)]
Update README.chromium for merge.

4 weeks agoMerge remote-tracking branch 'origin/merge-m39'
Dale Curtis [Tue, 23 Sep 2014 17:16:21 +0000 (10:16 -0700)]
Merge remote-tracking branch 'origin/merge-m39'

5 weeks agoUpdate ffmpegsumo.sigs for modified parameters to av_dict_get() 22/71622/1 merge-m39
John Rummell [Sat, 20 Sep 2014 00:38:45 +0000 (17:38 -0700)]
Update ffmpegsumo.sigs for modified parameters to av_dict_get()

5 weeks agoUpdate ffmpeg configs for M39. 03/71603/2
John Rummell [Wed, 17 Sep 2014 22:34:10 +0000 (15:34 -0700)]
Update ffmpeg configs for M39.

Change-Id: I7c5e46bff2f1f0cb90b7add49cbc41fa11c5deaa

5 weeks agoRename source_reqs to inputs. 97/71597/1
Dale Curtis [Tue, 16 Sep 2014 19:52:37 +0000 (12:52 -0700)]
Rename source_reqs to inputs.

BUG=none
TEST=none

5 weeks agoGN: Fix is_chromeos clauses in ffmpeg_options.gni, BUILD.gn 85/71585/2
Chris Masone [Wed, 10 Sep 2014 18:17:08 +0000 (11:17 -0700)]
GN: Fix is_chromeos clauses in ffmpeg_options.gni, BUILD.gn

There was a typo in the line that set
_default_ffmpeg_branding for CrOS. It referred to an
as-yet-nonexistent variable.

There was also an arm-and-is_chromeos-only error in BUILD.gn where
cflags was being set instead of appended to.

BUG=414453
TEST=gn gen out/Default --args='os="chromeos"'
Change-Id: Id2d4ace23213f62b5e1c8846bd749362430859b0

6 weeks agoUpdate build script to latest versions of libraries.
John Rummell [Thu, 11 Sep 2014 00:34:24 +0000 (17:34 -0700)]
Update build script to latest versions of libraries.

6 weeks agoMerge ffmpeg for M39
John Rummell [Thu, 11 Sep 2014 00:23:11 +0000 (17:23 -0700)]
Merge ffmpeg for M39

Taken from commit 5e3da256184e13502b3428f94e180888436d157b

Conflicts:
compat/w32pthreads.h

6 weeks agoMerge commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04'
Michael Niedermayer [Wed, 10 Sep 2014 23:26:31 +0000 (01:26 +0200)]
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>
6 weeks agoavcodec/h264: Use FF_ALLOCZ_ARRAY_OR_GOTO()
Michael Niedermayer [Wed, 10 Sep 2014 20:35:41 +0000 (22:35 +0200)]
avcodec/h264: Use FF_ALLOCZ_ARRAY_OR_GOTO()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 weeks agoavcodec/dnxhdenc: Use FF_ALLOCZ_ARRAY_OR_GOTO()
Michael Niedermayer [Wed, 10 Sep 2014 20:29:14 +0000 (22:29 +0200)]
avcodec/dnxhdenc: Use FF_ALLOCZ_ARRAY_OR_GOTO()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 weeks agoavcodec/mpegvideo: Use FF_ALLOCZ_ARRAY_OR_GOTO()
Michael Niedermayer [Wed, 10 Sep 2014 18:50:32 +0000 (20:50 +0200)]
avcodec/mpegvideo: Use FF_ALLOCZ_ARRAY_OR_GOTO()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 weeks agoavcodec/twinvq: Use FF_ALLOC_ARRAY_OR_GOTO()
Michael Niedermayer [Wed, 10 Sep 2014 18:44:19 +0000 (20:44 +0200)]
avcodec/twinvq: Use FF_ALLOC_ARRAY_OR_GOTO()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 weeks agodoc: Fix syntax and logical errors in avconv stream combination example
Diego Biurrun [Wed, 10 Sep 2014 16:38:15 +0000 (18:38 +0200)]
doc: Fix syntax and logical errors in avconv stream combination example

Bug-Id: 661
CC: libav-stable@libav.org
6 weeks agoavcodec/aacenc: Use FF_ALLOCZ_ARRAY_OR_GOTO()
Michael Niedermayer [Wed, 10 Sep 2014 13:06:44 +0000 (15:06 +0200)]
avcodec/aacenc: Use FF_ALLOCZ_ARRAY_OR_GOTO()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 weeks agoavcodec/ac3enc_template: Use FF_ALLOC_ARRAY_OR_GOTO()
Michael Niedermayer [Wed, 10 Sep 2014 13:06:28 +0000 (15:06 +0200)]
avcodec/ac3enc_template: Use FF_ALLOC_ARRAY_OR_GOTO()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 weeks agoavcodec/adpcmenc: Use FF_ALLOC_ARRAY_OR_GOTO()
Michael Niedermayer [Wed, 10 Sep 2014 12:37:12 +0000 (14:37 +0200)]
avcodec/adpcmenc: Use FF_ALLOC_ARRAY_OR_GOTO()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 weeks agoavformat/concatdec: fix "warning: explicitly assigning a variable of type int to...
Michael Niedermayer [Tue, 9 Sep 2014 23:22:57 +0000 (01:22 +0200)]
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>
6 weeks agoavformat/mp3dec: Improve seeking frame sync code
Michael Niedermayer [Sun, 7 Sep 2014 19:44:19 +0000 (21:44 +0200)]
avformat/mp3dec: Improve seeking frame sync code

Fixes Ticket3884

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 weeks agoav_filter/x86/idet: use HADDD where appropriate
Pascal Massimino [Tue, 9 Sep 2014 20:49:52 +0000 (22:49 +0200)]
av_filter/x86/idet: use HADDD where appropriate

Signed-off-by: James Almer <jamrial@gmail.com>
6 weeks agoavformat: remove FF_API_ASS_SSA dead code
Clément Bœsch [Sun, 7 Sep 2014 19:30:38 +0000 (21:30 +0200)]
avformat: remove FF_API_ASS_SSA dead code

6 weeks agoavcodec/snow: make new_picture const
Michael Niedermayer [Tue, 9 Sep 2014 19:02:15 +0000 (21:02 +0200)]
avcodec/snow: make new_picture const

Fixes "assignment discards const qualifier from pointer target type"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 weeks agoMerge commit 'ee0ebd3c1412fdd9d80aa97c98d1a20b893f1f47'
Michael Niedermayer [Tue, 9 Sep 2014 17:28:59 +0000 (19:28 +0200)]
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>
6 weeks agoMerge commit 'f629705b0239c80fddc1b0b15ed4bb9042c77d23'
Michael Niedermayer [Tue, 9 Sep 2014 17:10:12 +0000 (19:10 +0200)]
Merge commit 'f629705b0239c80fddc1b0b15ed4bb9042c77d23'

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

See: 428aa14a4851711ea1aa3f9b2d5bac867434993f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 weeks agoMerge commit 'ec217218c27d53c5b323323e6ef862bcdbcabe5f'
Michael Niedermayer [Tue, 9 Sep 2014 17:08:08 +0000 (19:08 +0200)]
Merge commit 'ec217218c27d53c5b323323e6ef862bcdbcabe5f'

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

See: a4dbabc8b3c123c071c925d2d749a50e4895ebcd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 weeks agoMerge commit '176a0fca3fd64f91d585f96137388e00d8c101b6'
Michael Niedermayer [Tue, 9 Sep 2014 16:58:23 +0000 (18:58 +0200)]
Merge commit '176a0fca3fd64f91d585f96137388e00d8c101b6'

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

See: 720c21d11ff0742989bae3e763fc0a85a587fdb6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 weeks agoav_filter/x86/idet: MMX/SSE2 implementation of 16bits filter_line()
Pascal Massimino [Tue, 9 Sep 2014 12:38:58 +0000 (14:38 +0200)]
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>
6 weeks agodv: K&R formatting cosmetics
Gabriel Dume [Mon, 8 Sep 2014 17:40:28 +0000 (13:40 -0400)]
dv: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 weeks agoavcodec/rawenc: drop sizeof(AVFrame) dependency
Michael Niedermayer [Tue, 9 Sep 2014 11:01:37 +0000 (13:01 +0200)]
avcodec/rawenc: drop sizeof(AVFrame) dependency

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 weeks agoMerge commit '9752d07d33d5370f7819865fbb5e582b982aad06'
Michael Niedermayer [Tue, 9 Sep 2014 10:12:29 +0000 (12:12 +0200)]
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>
6 weeks agox86inc: Make INIT_CPUFLAGS support an arbitrary number of cpuflags
Henrik Gramner [Thu, 4 Sep 2014 22:13:38 +0000 (00:13 +0200)]
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>
6 weeks agox86inc: Free up variable name "n" in global namespace
Loren Merritt [Thu, 4 Sep 2014 22:13:37 +0000 (00:13 +0200)]
x86inc: Free up variable name "n" in global namespace

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 weeks agox86inc: Make ym# behave the same way as xm#
Henrik Gramner [Thu, 4 Sep 2014 22:13:34 +0000 (00:13 +0200)]
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>
6 weeks agodirac: K&R formatting cosmetics
Gabriel Dume [Mon, 8 Sep 2014 22:32:34 +0000 (18:32 -0400)]
dirac: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 weeks agoavformat/mpeg: update comment on probe score
Michael Niedermayer [Tue, 9 Sep 2014 00:51:59 +0000 (02:51 +0200)]
avformat/mpeg: update comment on probe score

Found-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 weeks agoavdevice/x11grab: fix cursor drawing in multi-screen setup
Antonio Ospite [Mon, 8 Sep 2014 11:15:19 +0000 (13:15 +0200)]
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>
6 weeks agoavdevice/x11grab: rename the "w" Window to "root" in paint_mouse_pointer
Antonio Ospite [Mon, 8 Sep 2014 11:15:18 +0000 (13:15 +0200)]
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>
6 weeks agoavfilter/vf_cropdetect: Do not check lines or columns twice on black frames
Michael Niedermayer [Tue, 9 Sep 2014 00:06:17 +0000 (02:06 +0200)]
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>
6 weeks agoavformat/mpeg: increase score for short mpeg-ps by 1
Michael Niedermayer [Sun, 7 Sep 2014 17:18:21 +0000 (19:18 +0200)]
avformat/mpeg: increase score for short mpeg-ps by 1

Fixes Ticket 3855

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 weeks agoMerge commit '1ec335513f95bf2441f81d761ea127325ecd81a0'
Michael Niedermayer [Mon, 8 Sep 2014 20:12:57 +0000 (22:12 +0200)]
Merge commit '1ec335513f95bf2441f81d761ea127325ecd81a0'

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

Conflicts:
libavutil/time.c

See: ebef9f5a56d7df91e010a177a80cfc8dbe394305

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 weeks agotime: Add missing zero
Gabriel Dume [Mon, 8 Sep 2014 19:20:42 +0000 (15:20 -0400)]
time: Add missing zero

Leftover of 56d7df91e010a177a80cfc8dbe394305

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 weeks agoavcodec/mpeg4videodec: fix 'libavcodec/mpeg4videodec.c:2762:22: warning: unused varia...
Michael Niedermayer [Mon, 8 Sep 2014 19:31:47 +0000 (21:31 +0200)]
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>
6 weeks agoavcodec/cabac_functions: fix "warning: UNCHECKED_BITSTREAM_READER is not defined...
Michael Niedermayer [Mon, 8 Sep 2014 19:06:47 +0000 (21:06 +0200)]
avcodec/cabac_functions: fix "warning: UNCHECKED_BITSTREAM_READER is not defined, evaluates to 0"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 weeks agoavcodec/diracdec: Fix "warning: comparison of constant 4 with expression of type...
Michael Niedermayer [Mon, 8 Sep 2014 18:47:47 +0000 (20:47 +0200)]
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>
6 weeks agoRevert the default for ffplay to -noautoexit.
Carl Eugen Hoyos [Mon, 8 Sep 2014 15:51:12 +0000 (17:51 +0200)]
Revert the default for ffplay to -noautoexit.

Reviewed-by: Marton Balint
6 weeks agoPrint bits_per_raw_sample for ffprobe -show_streams.
Carl Eugen Hoyos [Mon, 8 Sep 2014 15:45:57 +0000 (17:45 +0200)]
Print bits_per_raw_sample for ffprobe -show_streams.

Fixes ticket #3919.

6 weeks agoPrint the actual bit depth for audio if it is different from the sample_fmt bit depth.
Carl Eugen Hoyos [Mon, 8 Sep 2014 15:45:47 +0000 (17:45 +0200)]
Print the actual bit depth for audio if it is different from the sample_fmt bit depth.

This is already done for video.

6 weeks agoavcodec/ac3dec_fixed: remove unused arrays
Michael Niedermayer [Mon, 8 Sep 2014 14:59:16 +0000 (16:59 +0200)]
avcodec/ac3dec_fixed: remove unused arrays

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 weeks agoavformat/rtpdec_qt: Fix 'warning: passing argument 2 of ffio_init_context discards...
Michael Niedermayer [Mon, 8 Sep 2014 14:55:57 +0000 (16:55 +0200)]
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>
6 weeks agoMAINTAINERS: add myself as segment maintainer
Stefano Sabatini [Mon, 8 Sep 2014 10:49:06 +0000 (12:49 +0200)]
MAINTAINERS: add myself as segment maintainer

6 weeks agolavf/segment: abort in case of invalid segment format options
Stefano Sabatini [Mon, 8 Sep 2014 10:47:37 +0000 (12:47 +0200)]
lavf/segment: abort in case of invalid segment format options

6 weeks agoavformat/utils: Exclude the header size when computing duration from bit_rate
Hendrik Leppkes [Sat, 6 Sep 2014 12:59:23 +0000 (14:59 +0200)]
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>
6 weeks agoMerge commit '1274ea8dbaec44355bde07f6bb31fec0c4e6fd2d'
Michael Niedermayer [Sun, 7 Sep 2014 22:54:55 +0000 (00:54 +0200)]
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>
6 weeks agoMerge commit 'fcf597625c7a991ca389f3a9b8ff4f5e383301c0'
Michael Niedermayer [Sun, 7 Sep 2014 22:45:02 +0000 (00:45 +0200)]
Merge commit 'fcf597625c7a991ca389f3a9b8ff4f5e383301c0'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 weeks agoMerge commit '803e82276b3716bf6012ec69e8854dae14a4fd2b'
Michael Niedermayer [Sun, 7 Sep 2014 22:38:26 +0000 (00:38 +0200)]
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>
6 weeks agoffserver: tests, force +global_header for ASF
Reynaldo H. Verdejo Pinochet [Mon, 1 Sep 2014 17:12:09 +0000 (13:12 -0400)]
ffserver: tests, force +global_header for ASF

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
6 weeks agoSplit off floating point AAN (I)DCT into separate components
Diego Biurrun [Fri, 29 Aug 2014 02:32:45 +0000 (19:32 -0700)]
Split off floating point AAN (I)DCT into separate components

6 weeks agoismindex: Avoid writing ismf files if no base name has been specified
Martin Storsjö [Fri, 5 Sep 2014 19:50:24 +0000 (22:50 +0300)]
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>
6 weeks agolibavformat: Check mkdir return error codes
Martin Storsjö [Fri, 5 Sep 2014 19:45:11 +0000 (22:45 +0300)]
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>
6 weeks agodoc/filters.texi: improve the wording of the expr_int_format documentation
Andreas Cadhalpun [Sat, 6 Sep 2014 21:49:43 +0000 (23:49 +0200)]
doc/filters.texi: improve the wording of the expr_int_format documentation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 weeks agoavformat/m4vdec: Check for non startcode 00 00 00 sequences in probe
Michael Niedermayer [Sun, 7 Sep 2014 14:39:39 +0000 (16:39 +0200)]
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>
6 weeks agoavcodec/mpegvideo: Set err on failure in ff_mpv_common_frame_size_change()
Michael Niedermayer [Sun, 7 Sep 2014 12:14:52 +0000 (14:14 +0200)]
avcodec/mpegvideo: Set err on failure in ff_mpv_common_frame_size_change()

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 weeks agoavcodec/mpegvideo: check that the context is initialized in ff_mpv_common_frame_size_...
Michael Niedermayer [Sun, 7 Sep 2014 11:00:47 +0000 (13:00 +0200)]
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>
6 weeks agoavcodec/mpegvideo: Use "goto fail" for all error paths in ff_mpv_common_frame_size_ch...
Michael Niedermayer [Sun, 7 Sep 2014 10:52:24 +0000 (12:52 +0200)]
avcodec/mpegvideo: Use "goto fail" for all error paths in ff_mpv_common_frame_size_change()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 weeks agoavcodec/mpegvideo: free_context_frame() cannot fail, make it return void
Michael Niedermayer [Sun, 7 Sep 2014 10:51:08 +0000 (12:51 +0200)]
avcodec/mpegvideo: free_context_frame() cannot fail, make it return void

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 weeks agodoc/muxers/segment: reword text for examples, improve consistency
Stefano Sabatini [Sun, 7 Sep 2014 11:12:41 +0000 (13:12 +0200)]
doc/muxers/segment: reword text for examples, improve consistency

6 weeks agolavf/segment: add segment_format_options option
Stefano Sabatini [Sat, 6 Sep 2014 13:43:11 +0000 (15:43 +0200)]
lavf/segment: add segment_format_options option

6 weeks agolibswresample: move condition to start of loop.
Reimar Döffinger [Sat, 6 Sep 2014 19:22:36 +0000 (21:22 +0200)]
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>
6 weeks agoRemove pointless if.
Reimar Döffinger [Sat, 6 Sep 2014 19:18:58 +0000 (21:18 +0200)]
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>
6 weeks agolibswresample: Avoid needlessly large on-stack array.
Reimar Döffinger [Tue, 2 Sep 2014 21:50:55 +0000 (23:50 +0200)]
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>
6 weeks agoffmpeg: Copy extradata if it has been initialized later from the encoder
Michael Niedermayer [Sat, 6 Sep 2014 02:42:48 +0000 (04:42 +0200)]
ffmpeg: Copy extradata if it has been initialized later from the encoder

Fixes Ticket3909

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 weeks agoavcodec/h264: Allow partial escaping
Michael Niedermayer [Sat, 6 Sep 2014 23:42:28 +0000 (01:42 +0200)]
avcodec/h264: Allow partial escaping

Fixes Ticket3923

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 weeks agoavformat/swfdec: Do not change the pixel format
Michael Niedermayer [Tue, 2 Sep 2014 14:42:33 +0000 (16:42 +0200)]
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>
6 weeks agoavfilter/af_silenceremove: remove dead code
Michael Niedermayer [Sat, 6 Sep 2014 10:56:03 +0000 (12:56 +0200)]
avfilter/af_silenceremove: remove dead code

Fixes CID1237284

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 weeks agoavcodec/hevc_ps: Always initialize backup in decode_vui()
Michael Niedermayer [Sat, 6 Sep 2014 10:40:34 +0000 (12:40 +0200)]
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>
6 weeks agoRELEASE_NOTES: mention the ffplay -autoexit behaviour change
Clément Bœsch [Sat, 6 Sep 2014 19:28:53 +0000 (21:28 +0200)]
RELEASE_NOTES: mention the ffplay -autoexit behaviour change

6 weeks agohuffyuvdec: avoid large stack use.
Reimar Döffinger [Tue, 2 Sep 2014 19:56:43 +0000 (21:56 +0200)]
huffyuvdec: avoid large stack use.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 weeks agocabac: Allow hardcoding CABAC table.
Reimar Döffinger [Sun, 31 Aug 2014 10:42:51 +0000 (12:42 +0200)]
cabac: Allow hardcoding CABAC table.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 weeks agocabac: initialize all of ff_h264_cabac_tables programmatically.
Reimar Döffinger [Sat, 30 Aug 2014 16:17:39 +0000 (18:17 +0200)]
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>
6 weeks agoaacsbr: support hardcoding tables.
Reimar Döffinger [Sat, 30 Aug 2014 15:27:57 +0000 (17:27 +0200)]
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>
6 weeks agoavcodec/hevc: fix dead code
Mickaël Raulet [Sat, 6 Sep 2014 17:05:21 +0000 (19:05 +0200)]
avcodec/hevc: fix dead code

fix CID 1231985

cherry picked from commit 745a35a777eaa5f77b8660b44098110a29916aae
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 weeks agoffplay: make autoexit the default
Michael Niedermayer [Sat, 6 Sep 2014 18:22:14 +0000 (20:22 +0200)]
ffplay: make autoexit the default

See: f9bc65e399d1883da21ae03d07b09348a11a5f49
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 weeks agoMerge commit '041caf1a63f091745b95a6d51c23fbdcb604d4ce'
Michael Niedermayer [Sat, 6 Sep 2014 18:20:44 +0000 (20:20 +0200)]
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>
6 weeks agoavformat/mpegts: fix spelling error
Andreas Cadhalpun [Sat, 6 Sep 2014 10:06:39 +0000 (12:06 +0200)]
avformat/mpegts: fix spelling error

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 weeks agoavplay: Exit by default at the end of playback
Diego Biurrun [Tue, 2 Sep 2014 22:45:21 +0000 (00:45 +0200)]
avplay: Exit by default at the end of playback

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

Bug-Id: 732

6 weeks agoavfilter/ebur128: rework channel weighting definition code
Clément Bœsch [Sat, 6 Sep 2014 11:47:59 +0000 (13:47 +0200)]
avfilter/ebur128: rework channel weighting definition code

Should fix CID1194399 (Bad bit shift operation)

7 weeks agoavcodec/mjpegdec: fix rounding of chroma_height
Michael Niedermayer [Sat, 6 Sep 2014 01:13:57 +0000 (03:13 +0200)]
avcodec/mjpegdec: fix rounding of chroma_height

Fixes green line at the bottom
Fixes Ticket3913

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 weeks agodoc: Copyright in CSS, CSS split in 2 files
db0company [Fri, 5 Sep 2014 18:31:16 +0000 (20:31 +0200)]
doc: Copyright in CSS, CSS split in 2 files

Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 weeks agolavd/v4l2: introduce enqueue_buffer()
Giorgio Vazzana [Mon, 1 Sep 2014 20:20:05 +0000 (22:20 +0200)]
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>
7 weeks agoavformat/srtdec: speed up probing
wm4 [Thu, 4 Sep 2014 19:16:13 +0000 (21:16 +0200)]
avformat/srtdec: speed up probing

7 weeks agoavformat/realtextdec: UTF-16 support
wm4 [Tue, 2 Sep 2014 18:54:16 +0000 (20:54 +0200)]
avformat/realtextdec: UTF-16 support

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

7 weeks agoavformat/samidec: UTF-16 support
wm4 [Tue, 2 Sep 2014 18:53:08 +0000 (20:53 +0200)]
avformat/samidec: UTF-16 support

ff_smil_extract_next_chunk() is still used by RealText.

7 weeks agoavformat/srtdec: UTF-16 support
wm4 [Tue, 2 Sep 2014 18:52:07 +0000 (20:52 +0200)]
avformat/srtdec: UTF-16 support