ffmpeg.git
5 years agolavd/pulse_audio_enc: add buffer size control options
Lukasz Marek [Sun, 24 Nov 2013 01:35:33 +0000 (02:35 +0100)]
lavd/pulse_audio_enc: add buffer size control options

Add options to control the size of the PulseAudio buffer.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 27 Nov 2013 01:35:38 +0000 (02:35 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: Check for pod2man instead of perl for manual page generation

Conflicts:
configure
doc/Makefile

The code that this changes is mostly not part of ffmpeg
thus only a few whitespaces end up being merged

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4da3f410d176dd1a55d7cbe5d2e2ead342027f13'
Michael Niedermayer [Wed, 27 Nov 2013 01:26:03 +0000 (02:26 +0100)]
Merge commit '4da3f410d176dd1a55d7cbe5d2e2ead342027f13'

* commit '4da3f410d176dd1a55d7cbe5d2e2ead342027f13':
  configure: Restore doc option to disable building the documentation

Conflicts:
configure

See: eff2edae562096c1e21e8c048392ffe8968181f2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/Makefile: fix building examples if a program suffix is set
Michael Niedermayer [Wed, 27 Nov 2013 01:23:55 +0000 (02:23 +0100)]
doc/Makefile: fix building examples if a program suffix is set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'dc80e2f7a529d6e4416b40b68699be16fed62d6c'
Michael Niedermayer [Wed, 27 Nov 2013 00:52:55 +0000 (01:52 +0100)]
Merge commit 'dc80e2f7a529d6e4416b40b68699be16fed62d6c'

* commit 'dc80e2f7a529d6e4416b40b68699be16fed62d6c':
  Makefile: Fix building programs on systems with a nonempty executable suffix

Conflicts:
Makefile

See: f1db007e008d3ece791c7ac65c537d1d301ea0cc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/g2meet: check available space before copying palette
Michael Niedermayer [Tue, 26 Nov 2013 20:53:47 +0000 (21:53 +0100)]
avcodec/g2meet: check available space before copying palette

Fixes out of array read
Fixes: asan_heap-uaf_ae6067_5415_g2m4.wmv

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/g2meet: fix stride calculation, use correct format field
Michael Niedermayer [Tue, 26 Nov 2013 22:27:21 +0000 (23:27 +0100)]
avcodec/g2meet: fix stride calculation, use correct format field

Fixes out of array accesses
Fixes: asan_heap-oob_ae5f63_5415_g2m4.wmv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agobuild: Check for pod2man instead of perl for manual page generation
Diego Biurrun [Tue, 26 Nov 2013 19:37:54 +0000 (11:37 -0800)]
build: Check for pod2man instead of perl for manual page generation

Some systems provide Perl without pod2man.

5 years agoconfigure: Restore doc option to disable building the documentation
Diego Biurrun [Mon, 25 Nov 2013 23:19:57 +0000 (15:19 -0800)]
configure: Restore doc option to disable building the documentation

Also add appropriate dependency declarations for perl and texi2html.

5 years agoMakefile: Fix building programs on systems with a nonempty executable suffix
Martin Storsjö [Tue, 26 Nov 2013 10:10:03 +0000 (12:10 +0200)]
Makefile: Fix building programs on systems with a nonempty executable suffix

This fixes leftover issues from 14abeaa4 which caused make
rules for programs to not match up properly when the executable
suffix was nonempty.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agolavd/sdl: add delay when no events are found in the event queue
Stefano Sabatini [Tue, 26 Nov 2013 17:37:30 +0000 (18:37 +0100)]
lavd/sdl: add delay when no events are found in the event queue

Avoid busy loops and decrease CPU usage.

Suggested-By: Roger Pack
5 years agolavd/sdl: apply misc cosmetics to options
Stefano Sabatini [Mon, 25 Nov 2013 12:39:51 +0000 (13:39 +0100)]
lavd/sdl: apply misc cosmetics to options

5 years agolavd/sdl: allow to change window size
Stefano Sabatini [Mon, 25 Nov 2013 12:31:06 +0000 (13:31 +0100)]
lavd/sdl: allow to change window size

5 years agolavd/sdl: move compute_overlay_rect() before event_thread()
Stefano Sabatini [Mon, 25 Nov 2013 12:27:47 +0000 (13:27 +0100)]
lavd/sdl: move compute_overlay_rect() before event_thread()

It will be used in event_thread() in a pending patch.

5 years agolavd/sdl: factorize overlay rect size in a separate function
Stefano Sabatini [Mon, 25 Nov 2013 11:28:53 +0000 (12:28 +0100)]
lavd/sdl: factorize overlay rect size in a separate function

5 years agolavd/sdl: add event handler thread
Stefano Sabatini [Sun, 24 Nov 2013 18:32:59 +0000 (19:32 +0100)]
lavd/sdl: add event handler thread

SDL_Init() is called on the event handler thread, as required by SDL in
Windows to avoid deadlocks as discovered by Roger Pack.

Fix trac ticket #1743 and #1744.

5 years agoHEVC : valgrind fix : vps_list
gcocherel [Tue, 26 Nov 2013 07:49:49 +0000 (08:49 +0100)]
HEVC : valgrind fix : vps_list

cherry picked from commit 211c39ade87bc079eabc862a6b684544dc88a786

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 26 Nov 2013 12:13:45 +0000 (13:13 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavc: remove mp3_header_(de)compress bitstream filters

Conflicts:
Changelog
libavcodec/mp3_header_compress_bsf.c
libavcodec/mp3_header_decompress_bsf.c

The decompress filter is left in place for interoperability and support of
files that used the compress filter.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1eaac1d6f7bb8e52d82e1a114c88a59a9a8e5025'
Michael Niedermayer [Tue, 26 Nov 2013 12:00:46 +0000 (13:00 +0100)]
Merge commit '1eaac1d6f7bb8e52d82e1a114c88a59a9a8e5025'

* commit '1eaac1d6f7bb8e52d82e1a114c88a59a9a8e5025':
  mpeg12dec: Extract CC user data into frame side data

Conflicts:
doc/APIchanges
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoRevert "avcodec/gsmdec: reject unsupported msn audio modes"
Michael Niedermayer [Tue, 26 Nov 2013 11:38:03 +0000 (12:38 +0100)]
Revert "avcodec/gsmdec: reject unsupported msn audio modes"

they should be supported now

This reverts commit 1ee1a3d9f4e152b641f05d2be6dbe3f440485cca.

5 years agoMerge commit 'a16577d9857206089fd8bce6a342b31dbd7fb9b0'
Michael Niedermayer [Tue, 26 Nov 2013 11:37:20 +0000 (12:37 +0100)]
Merge commit 'a16577d9857206089fd8bce6a342b31dbd7fb9b0'

* commit 'a16577d9857206089fd8bce6a342b31dbd7fb9b0':
  MSN Audio support

Conflicts:
libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '56d061ce9da954560892e3551513d5ecc0439846'
Michael Niedermayer [Tue, 26 Nov 2013 11:28:31 +0000 (12:28 +0100)]
Merge commit '56d061ce9da954560892e3551513d5ecc0439846'

* commit '56d061ce9da954560892e3551513d5ecc0439846':
  metasound: add last missing modes (8kHz @ 6kbps per channel)

Conflicts:
Changelog
doc/general.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'de44dfc7c0ec02bda7d846ef713145c890bfae3f'
Michael Niedermayer [Tue, 26 Nov 2013 11:01:55 +0000 (12:01 +0100)]
Merge commit 'de44dfc7c0ec02bda7d846ef713145c890bfae3f'

* commit 'de44dfc7c0ec02bda7d846ef713145c890bfae3f':
  vc1: Reset numref if fieldmode is not set

This change is redundant, numref is already reset

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agocmdutils: remove this_year constant, use CONFIG_THIS_YEAR instead
Stefano Sabatini [Tue, 26 Nov 2013 09:03:32 +0000 (10:03 +0100)]
cmdutils: remove this_year constant, use CONFIG_THIS_YEAR instead

Simplify.

5 years agoconfigure: define CONFIG_THIS_YEAR at the configure level
Stefano Sabatini [Mon, 25 Nov 2013 22:28:11 +0000 (23:28 +0100)]
configure: define CONFIG_THIS_YEAR at the configure level

The macro value can be shared between configure script and cmdutils.c.

5 years agolavc: remove mp3_header_(de)compress bitstream filters
Anton Khirnov [Sun, 24 Nov 2013 13:14:13 +0000 (14:14 +0100)]
lavc: remove mp3_header_(de)compress bitstream filters

They mangle the mp3 header in a non-standard way to save a few bytes.
People who care about space so much should just use a more efficient
codec.

5 years agompeg12dec: Extract CC user data into frame side data
John Stebbins [Mon, 25 Nov 2013 23:57:28 +0000 (15:57 -0800)]
mpeg12dec: Extract CC user data into frame side data

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoMSN Audio support
Kostya Shishkov [Sat, 7 Sep 2013 19:06:22 +0000 (21:06 +0200)]
MSN Audio support

This is essentially a MS GSM decoder extension that supports more
sampling rates and lower bitrates.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agometasound: add last missing modes (8kHz @ 6kbps per channel)
Kostya Shishkov [Mon, 18 Nov 2013 11:07:14 +0000 (12:07 +0100)]
metasound: add last missing modes (8kHz @ 6kbps per channel)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 26 Nov 2013 01:15:47 +0000 (02:15 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aacsbr: Add some const casts to silence warnings in ff_sbr_apply()

Conflicts:
libavcodec/aacsbr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/Makefile fix PROGS
Michael Niedermayer [Tue, 26 Nov 2013 01:06:59 +0000 (02:06 +0100)]
doc/Makefile fix PROGS

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMakefile: Fix building progs out of progs_g
Michael Niedermayer [Tue, 26 Nov 2013 00:50:25 +0000 (01:50 +0100)]
Makefile: Fix building progs out of progs_g

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ab81f24ad43bddf77ddd25cba86780c1c884996c'
Michael Niedermayer [Tue, 26 Nov 2013 00:31:00 +0000 (01:31 +0100)]
Merge commit 'ab81f24ad43bddf77ddd25cba86780c1c884996c'

* commit 'ab81f24ad43bddf77ddd25cba86780c1c884996c':
  build: Integrate multilibrary examples into the build system

Conflicts:
configure
doc/Makefile
doc/examples/muxing.c
doc/examples/output.c
libavformat/Makefile
libavformat/output-example.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '14abeaa43d021afdce9119d906891abe89c03b88'
Michael Niedermayer [Mon, 25 Nov 2013 23:05:38 +0000 (00:05 +0100)]
Merge commit '14abeaa43d021afdce9119d906891abe89c03b88'

* commit '14abeaa43d021afdce9119d906891abe89c03b88':
  build: Separate building programs linking against libav* from building av*

Conflicts:
Makefile
doc/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovc1: Reset numref if fieldmode is not set
Kostya Shishkov [Mon, 25 Nov 2013 13:04:41 +0000 (14:04 +0100)]
vc1: Reset numref if fieldmode is not set

There are samples in the wild with B-frames and P-frames with different
interlace mode.

CC: libav-stable@libav.org
Reported-by: Jean-Baptiste Kempf <jb@videolan.org>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoavcodec/ac3dec: check bap before use.
Michael Niedermayer [Mon, 25 Nov 2013 22:16:17 +0000 (23:16 +0100)]
avcodec/ac3dec: check bap before use.

Fixes out of array read
Fixes assertion failure
Fixes asan_static-oob_16431c0_8036_rio_bravo_mono_64_spx.ac3

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoaacsbr: Add some const casts to silence warnings in ff_sbr_apply()
Diego Biurrun [Sat, 23 Nov 2013 02:14:27 +0000 (03:14 +0100)]
aacsbr: Add some const casts to silence warnings in ff_sbr_apply()

5 years agobuild: Integrate multilibrary examples into the build system
Diego Biurrun [Sat, 2 Nov 2013 16:05:28 +0000 (17:05 +0100)]
build: Integrate multilibrary examples into the build system

This includes moving libavformat/output-example to doc/examples/output.

5 years agobuild: Separate building programs linking against libav* from building av*
Diego Biurrun [Sat, 2 Nov 2013 15:44:18 +0000 (16:44 +0100)]
build: Separate building programs linking against libav* from building av*

This will allow cleaner integration of building example programs.

5 years agoRevert "Merge remote-tracking branch 'qatar/master'" (43dec5ef9a360c9ffac3278f464832b...
Michael Niedermayer [Mon, 25 Nov 2013 18:45:43 +0000 (19:45 +0100)]
Revert "Merge remote-tracking branch 'qatar/master'" (43dec5ef9a360c9ffac3278f464832bd99af0cb0)

Fixes out of array accesses
Fixes asan_static-oob_eb9812_5961_iv41.avi
This reverts the merge of c9ef6b09326a24010bf86d6b0d19cfa42df4d546

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
5 years agoffprobe: add support for subtitle frames
Marton Balint [Sun, 24 Nov 2013 14:09:52 +0000 (15:09 +0100)]
ffprobe: add support for subtitle frames

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
5 years agolavf/segment: add a few log messages when avio_open2() fails
Stefano Sabatini [Mon, 25 Nov 2013 18:20:11 +0000 (19:20 +0100)]
lavf/segment: add a few log messages when avio_open2() fails

5 years agolavf/segment: add segment_list_entry_prefix option
Stefano Sabatini [Fri, 22 Nov 2013 11:49:05 +0000 (12:49 +0100)]
lavf/segment: add segment_list_entry_prefix option

This option allows to add a prefix to the segment list entry filenames.

Also set by default the list entry filenames to the corresponding
segment basename, consistent with the HLS muxer.

Based on an idea by Steven Liu <lingjiujianke@gmail.com>.

5 years agolavf: Exporting opus pre_skip in AVCodecContext
Vignesh Venkatasubramanian [Thu, 21 Nov 2013 20:44:11 +0000 (12:44 -0800)]
lavf: Exporting opus pre_skip in AVCodecContext

Opus Pre Skip is exported in AVCodecContext->delay similar to how
it is done for matroska. Doing the same for ogg too.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 25 Nov 2013 10:26:15 +0000 (11:26 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc: Add the host executable suffix for the print_options dependency

See: d48f014ff1db985fa3f74eddfb30bf513f99ff7a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc: Add the host executable suffix for the print_options dependency
Martin Storsjö [Sun, 24 Nov 2013 21:11:59 +0000 (23:11 +0200)]
doc: Add the host executable suffix for the print_options dependency

This fixes building on windows.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavcodec/pthread: check packet buffer allocation
Hendrik Leppkes [Sun, 24 Nov 2013 20:50:19 +0000 (21:50 +0100)]
avcodec/pthread: check packet buffer allocation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoPartially revert "Merge commit 'f187557ab4612776f7f527ecf3d40062975c3e4c'"
James Almer [Sun, 24 Nov 2013 21:40:16 +0000 (18:40 -0300)]
Partially revert "Merge commit 'f187557ab4612776f7f527ecf3d40062975c3e4c'"

This partially reverts commit c0237d19a0269ff44e909434f1b2b645fad2d281
Some scripts make use of --disable-doc

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffplay: do not call avcodec_register_all() explicitly
Stefano Sabatini [Sun, 24 Nov 2013 11:49:13 +0000 (12:49 +0100)]
ffplay: do not call avcodec_register_all() explicitly

avcodec_register_all() is implicitly called by av_register_all().

5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 24 Nov 2013 22:27:27 +0000 (23:27 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: Import makedef script from c99-to-c89

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agobuild: Import makedef script from c99-to-c89
Derek Buitenhuis [Thu, 21 Nov 2013 10:36:06 +0000 (10:36 +0000)]
build: Import makedef script from c99-to-c89

This allows MSVC 2013 and ICL to build with no external
dependencies.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoavformat/asfdec: ignore packet_segments
Michael Niedermayer [Sun, 24 Nov 2013 18:14:49 +0000 (19:14 +0100)]
avformat/asfdec: ignore packet_segments

Fixes Ticket1708
Based on patch by Alberto Delmás

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/asfdec: reset packet_time_start when asf_read_frame_header() failed
Alberto Delmás [Sun, 24 Nov 2013 19:32:31 +0000 (20:32 +0100)]
avformat/asfdec: reset packet_time_start when asf_read_frame_header() failed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/asfdec: remove duplicated packet_segments reset
Michael Niedermayer [Sun, 24 Nov 2013 17:48:38 +0000 (18:48 +0100)]
avformat/asfdec: remove duplicated packet_segments reset

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/sdl: do not manually free window_title and icon_title fields
Stefano Sabatini [Sun, 24 Nov 2013 18:29:04 +0000 (19:29 +0100)]
lavd/sdl: do not manually free window_title and icon_title fields

They are automatically freed when calling av_write_trailer(). Simplify.

5 years agodoc/outdevs/sdl: fix confusing text about window_fullscreen default value
Stefano Sabatini [Sun, 24 Nov 2013 18:20:29 +0000 (19:20 +0100)]
doc/outdevs/sdl: fix confusing text about window_fullscreen default value

5 years agolavf/mpegenc: Print a warning if ac3, pcm_s16be or dts are muxed into mpeg1.
Carl Eugen Hoyos [Sun, 24 Nov 2013 09:37:52 +0000 (10:37 +0100)]
lavf/mpegenc: Print a warning if ac3, pcm_s16be or dts are muxed into mpeg1.

Some media players don't play the resulting files.
The warning should help users to avoid the issues described in ticket #1720.

5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 24 Nov 2013 04:21:19 +0000 (05:21 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Add missing #includes for *INT64_MAX and *INT64_C

Conflicts:
ffmpeg.c
ffmpeg_filter.c
ffplay.c
libavformat/assdec.c
libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0eeeb9647e9c92c9edfd0b18c7cb5da7ac666f85'
Michael Niedermayer [Sun, 24 Nov 2013 04:12:07 +0000 (05:12 +0100)]
Merge commit '0eeeb9647e9c92c9edfd0b18c7cb5da7ac666f85'

* commit '0eeeb9647e9c92c9edfd0b18c7cb5da7ac666f85':
  mpegaudiodec: Consistently handle fixed/float templating

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '48b24bd2d208ce0f124029ac4c5ac5cb1fca4175'
Michael Niedermayer [Sun, 24 Nov 2013 04:05:09 +0000 (05:05 +0100)]
Merge commit '48b24bd2d208ce0f124029ac4c5ac5cb1fca4175'

* commit '48b24bd2d208ce0f124029ac4c5ac5cb1fca4175':
  ac3dec: Fix out-of-array read

Conflicts:
libavcodec/ac3dec.c

See: 2cbf27b08a4991de608b305a8600b59467587605
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f187557ab4612776f7f527ecf3d40062975c3e4c'
Michael Niedermayer [Sun, 24 Nov 2013 03:55:35 +0000 (04:55 +0100)]
Merge commit 'f187557ab4612776f7f527ecf3d40062975c3e4c'

* commit 'f187557ab4612776f7f527ecf3d40062975c3e4c':
  build: more fine-grained dependencies for documentation build tools

Conflicts:
configure
doc/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/jpeg2000dec: Check precno before using it in JPEG2000_PGOD_CPRL
Michael Niedermayer [Sun, 24 Nov 2013 02:50:20 +0000 (03:50 +0100)]
avcodec/jpeg2000dec: Check precno before using it in JPEG2000_PGOD_CPRL

Fixes out of array reads
Fixes: asan_heap-oob_f0de57_6823_mjp2.mov

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffprobe: use designated initializer for AVClass
Paul B Mahol [Sat, 23 Nov 2013 22:14:49 +0000 (22:14 +0000)]
ffprobe: use designated initializer for AVClass

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/vp9dsp: remove unused stride parameter in loop_filter().
Clément Bœsch [Sat, 23 Nov 2013 20:42:24 +0000 (21:42 +0100)]
avcodec/vp9dsp: remove unused stride parameter in loop_filter().

The stride argument is passed either as stridea or strideb.

5 years agoAdd missing #includes for *INT64_MAX and *INT64_C
Diego Biurrun [Sat, 23 Nov 2013 20:32:55 +0000 (21:32 +0100)]
Add missing #includes for *INT64_MAX and *INT64_C

5 years agompegaudiodec: Consistently handle fixed/float templating
Diego Biurrun [Tue, 19 Nov 2013 20:47:39 +0000 (21:47 +0100)]
mpegaudiodec: Consistently handle fixed/float templating

5 years agoac3dec: Fix out-of-array read
Tim Walker [Sat, 23 Nov 2013 17:29:21 +0000 (18:29 +0100)]
ac3dec: Fix out-of-array read

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoavcodec/hnm4video: allocate frame only when theres a coded frame
Michael Niedermayer [Sat, 23 Nov 2013 19:48:35 +0000 (20:48 +0100)]
avcodec/hnm4video: allocate frame only when theres a coded frame

Fixes memleak
Fixes: asan_heap-oob_e76bdf_2224_MOTHOO.HNM

This patch also removes the setting of palette_has_changed,
which was set on a frame that was never returned

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agobuild: more fine-grained dependencies for documentation build tools
Diego Biurrun [Fri, 22 Nov 2013 00:57:56 +0000 (16:57 -0800)]
build: more fine-grained dependencies for documentation build tools

Perl is needed to build the manual pages, texi2html for the HTML pages.

5 years agolibvpxenc: update cpu-used default
James Zern [Sat, 23 Nov 2013 04:26:46 +0000 (20:26 -0800)]
libvpxenc: update cpu-used default

3 -> 1. vp8 encoding speed has improved since the initial release and 1
is a reasonable default for vp9 as well.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibvpxdec: set CODEC_CAP_DR1 for vp9
James Zern [Sat, 23 Nov 2013 04:26:22 +0000 (20:26 -0800)]
libvpxdec: set CODEC_CAP_DR1 for vp9

it shares vp8_decode() with vp8 which already has the flag set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 23 Nov 2013 13:53:39 +0000 (14:53 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libschroedingerenc: do not assert on values from external libraries

Conflicts:
libavcodec/libschroedingerenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'
Michael Niedermayer [Sat, 23 Nov 2013 13:43:08 +0000 (14:43 +0100)]
Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'

* commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea':
  avconv: add support for VDPAU decoding

Conflicts:
Changelog
Makefile
configure
ffmpeg.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '07fd0a22192805d56c635eb294dc26b0a54ae325'
Michael Niedermayer [Sat, 23 Nov 2013 13:26:27 +0000 (14:26 +0100)]
Merge commit '07fd0a22192805d56c635eb294dc26b0a54ae325'

* commit '07fd0a22192805d56c635eb294dc26b0a54ae325':
  avconv: add infrastructure for using hwaccels

Conflicts:
ffmpeg.c
ffmpeg.h
ffmpeg_filter.c
ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd4df02131b5522a99a4e6035368484e809706ed5'
Michael Niedermayer [Sat, 23 Nov 2013 12:45:04 +0000 (13:45 +0100)]
Merge commit 'd4df02131b5522a99a4e6035368484e809706ed5'

* commit 'd4df02131b5522a99a4e6035368484e809706ed5':
  ac3dec: Remove write-only channel_layout field from AC3DecodeContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavcodec/ac3dec: fix channel_layout
Michael Niedermayer [Sat, 23 Nov 2013 12:32:18 +0000 (13:32 +0100)]
libavcodec/ac3dec: fix channel_layout

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b53285462263ef8a795f0e289abd5799b4c57652'
Michael Niedermayer [Sat, 23 Nov 2013 11:18:07 +0000 (12:18 +0100)]
Merge commit 'b53285462263ef8a795f0e289abd5799b4c57652'

* commit 'b53285462263ef8a795f0e289abd5799b4c57652':
  ac3: implement request_channel_layout.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c16bfb147df8a9d350e8a0dbc01937b78faf5949'
Michael Niedermayer [Sat, 23 Nov 2013 11:01:42 +0000 (12:01 +0100)]
Merge commit 'c16bfb147df8a9d350e8a0dbc01937b78faf5949'

* commit 'c16bfb147df8a9d350e8a0dbc01937b78faf5949':
  swscale: x86: Consistently use lowercase function name suffixes

Conflicts:
libswscale/x86/rgb2rgb.c
libswscale/x86/swscale.c

See: 1de064e21e7f1bbdd2347ba8967089a18669fcf8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibschroedingerenc: do not assert on values from external libraries
Alexandra Khirnova [Thu, 21 Nov 2013 21:06:31 +0000 (22:06 +0100)]
libschroedingerenc: do not assert on values from external libraries

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoavconv: add support for VDPAU decoding
Anton Khirnov [Sun, 3 Nov 2013 18:21:00 +0000 (19:21 +0100)]
avconv: add support for VDPAU decoding

5 years agoavconv: add infrastructure for using hwaccels
Anton Khirnov [Sat, 2 Nov 2013 21:06:36 +0000 (22:06 +0100)]
avconv: add infrastructure for using hwaccels

5 years agoAdd --enable-rpath option to add -Wl,-rpath to pkg-config files.
Reimar Döffinger [Sun, 10 Nov 2013 08:02:51 +0000 (09:02 +0100)]
Add --enable-rpath option to add -Wl,-rpath to pkg-config files.

This allows installing into e.g. /usr/lib/ffmpeg and binaries linked
against ffmpeg will pick these .so file while binaries linked against
some fork or different version will pick the libraries in /usr/lib.
There will be still some issues for binaries that (indirectly) end up
depending on multiple variants, but for the simpler cases it should allow
different applications to use different (compatible) variants that
are installed at the same time.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoavcodec/hnm4video: check writeoffset in decode_interframe_v4a()
Michael Niedermayer [Fri, 22 Nov 2013 22:48:58 +0000 (23:48 +0100)]
avcodec/hnm4video: check writeoffset in decode_interframe_v4a()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/hnm: check chunk_size == 0
Michael Niedermayer [Fri, 22 Nov 2013 22:44:57 +0000 (23:44 +0100)]
avformat/hnm: check chunk_size == 0

Fixes potential infinite loop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hnm4video: check dimensions for validity
Michael Niedermayer [Fri, 22 Nov 2013 22:11:20 +0000 (23:11 +0100)]
avcodec/hnm4video: check dimensions for validity

Fixes out of array read
Fixes: asan_heap-oob_e76e18_1244_CASSE.HNM
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoac3dec: Remove write-only channel_layout field from AC3DecodeContext
Tim Walker [Fri, 22 Nov 2013 16:25:49 +0000 (17:25 +0100)]
ac3dec: Remove write-only channel_layout field from AC3DecodeContext

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoac3: implement request_channel_layout.
Tim Walker [Fri, 22 Nov 2013 16:25:48 +0000 (17:25 +0100)]
ac3: implement request_channel_layout.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoavcodec/vp9dsp: pass dconly bit as macro argument.
Clément Bœsch [Fri, 22 Nov 2013 22:26:28 +0000 (23:26 +0100)]
avcodec/vp9dsp: pass dconly bit as macro argument.

5 years agoswscale: x86: Consistently use lowercase function name suffixes
Diego Biurrun [Thu, 21 Nov 2013 15:30:00 +0000 (16:30 +0100)]
swscale: x86: Consistently use lowercase function name suffixes

5 years agoavcodec/hnm4video: fix missing newlines in error messages
Michael Niedermayer [Fri, 22 Nov 2013 21:15:35 +0000 (22:15 +0100)]
avcodec/hnm4video: fix missing newlines in error messages

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hnm4video: fix write offset checks in decode_interframe_v4()
Michael Niedermayer [Fri, 22 Nov 2013 20:55:13 +0000 (21:55 +0100)]
avcodec/hnm4video: fix write offset checks in decode_interframe_v4()

Fixes: asan_heap-oob_e76a51_1244_CASSE.HNM

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hnm4video: check offset in decode_interframe_v4() more completely
Michael Niedermayer [Fri, 22 Nov 2013 20:00:11 +0000 (21:00 +0100)]
avcodec/hnm4video: check offset in decode_interframe_v4() more completely

Fixes out of array reads
Fixes: signal_sigsegv_e74c1e_1092_BROCIME.HNM
Fixes: signal_sigsegv_e74e85_2620_PLAQUE0.HNM

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mov: Check that we have a stream before accessing it in mov_read_ares()
Michael Niedermayer [Fri, 22 Nov 2013 19:09:03 +0000 (20:09 +0100)]
avformat/mov: Check that we have a stream before accessing it in mov_read_ares()

Fixes out of array read
Fixes: signal_sigsegv_6f1855_3910_avid_test_alpha.mov

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vp9dsp: add DC only versions for idct/idct.
Clément Bœsch [Fri, 22 Nov 2013 19:16:09 +0000 (20:16 +0100)]
avcodec/vp9dsp: add DC only versions for idct/idct.

before:
  ./ffmpeg -v 0 -nostats -i ~/samples/vp9/etv.webm -f null -  16.29s user 0.02s system 99% cpu 16.323 total
  ./ffmpeg -v 0 -nostats -i ~/samples/vp9/etv.webm -f null -  16.32s user 0.01s system 99% cpu 16.351 total
  ./ffmpeg -v 0 -nostats -i ~/samples/vp9/etv.webm -f null -  16.27s user 0.05s system 99% cpu 16.335 total

after:
  ./ffmpeg -v 0 -nostats -i ~/samples/vp9/etv.webm -f null -  15.22s user 0.03s system 99% cpu 15.257 total
  ./ffmpeg -v 0 -nostats -i ~/samples/vp9/etv.webm -f null -  15.20s user 0.02s system 99% cpu 15.237 total
  ./ffmpeg -v 0 -nostats -i ~/samples/vp9/etv.webm -f null -  15.19s user 0.02s system 99% cpu 15.227 total

5 years agoavformat/ipmovie: check OPCODE_INIT_VIDEO_BUFFERS size more completely
Michael Niedermayer [Fri, 22 Nov 2013 18:47:34 +0000 (19:47 +0100)]
avformat/ipmovie: check OPCODE_INIT_VIDEO_BUFFERS size more completely

Fixes use of uninitialized data

Fixes: signal_sigsegv_1571228_5930_ipmovie_interplayvideo_interplay_dpcm__bislogo.mve

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/rv10: revert hunk from ce9f5b13ed1eb1882479574c12af24cf0e2b8aaf
Michael Niedermayer [Fri, 22 Nov 2013 18:30:33 +0000 (19:30 +0100)]
avcodec/rv10: revert hunk from ce9f5b13ed1eb1882479574c12af24cf0e2b8aaf

Fixes segfault
Fixes: signal_sigsegv_103f872_2759_RVTR_behere_ivideo_motor_cross_interview_final_56kbps.rm

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 22 Nov 2013 17:15:09 +0000 (18:15 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  hls: Avoid reading outside of the allocated array

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8c929098141ebc94ad3f303521c520bb3dc6d8f6'
Michael Niedermayer [Fri, 22 Nov 2013 17:07:23 +0000 (18:07 +0100)]
Merge commit '8c929098141ebc94ad3f303521c520bb3dc6d8f6'

* commit '8c929098141ebc94ad3f303521c520bb3dc6d8f6':
  hls: Check whether the AVIOContext contains a new redirected URL

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'be4edda6731a341d3fdeaa0e57753dc396790362'
Michael Niedermayer [Fri, 22 Nov 2013 16:48:45 +0000 (17:48 +0100)]
Merge commit 'be4edda6731a341d3fdeaa0e57753dc396790362'

* commit 'be4edda6731a341d3fdeaa0e57753dc396790362':
  http: Expose the content location via an AVOption

Conflicts:
libavformat/http.c
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '393d80cc278e2b2f5c9e7805db176e6f28335a33'
Michael Niedermayer [Fri, 22 Nov 2013 16:26:03 +0000 (17:26 +0100)]
Merge commit '393d80cc278e2b2f5c9e7805db176e6f28335a33'

* commit '393d80cc278e2b2f5c9e7805db176e6f28335a33':
  http: Support relative URL redirection

Conflicts:
libavformat/http.c

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