ffmpeg.git
7 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>
7 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>
7 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>
7 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>
7 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.

7 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.

7 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
7 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>
7 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

7 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>.

7 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>
7 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>
7 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>
7 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>
7 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>
7 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().

7 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>
7 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>
7 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>
7 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>
7 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>
7 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.

7 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

7 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.

7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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.

7 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

7 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

7 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>
7 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>
7 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.

7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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

7 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

7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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.

7 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

7 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>
7 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>
7 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>
7 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>
7 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

7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 years agodoc: delete git-howto.txt
Timothy Gu [Sat, 9 Nov 2013 23:36:39 +0000 (15:36 -0800)]
doc: delete git-howto.txt

This is already available in Texinfo version.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
7 years agoMerge commit '76267ecc82e3018e1913a2483d5fc47d0949cbd8'
Michael Niedermayer [Fri, 22 Nov 2013 16:18:41 +0000 (17:18 +0100)]
Merge commit '76267ecc82e3018e1913a2483d5fc47d0949cbd8'

* commit '76267ecc82e3018e1913a2483d5fc47d0949cbd8':
  http: Remove an unrelated and mistakenly set AVOption unit name

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavutil/utf8: put under #ifdef TEST
Michael Niedermayer [Fri, 22 Nov 2013 16:09:31 +0000 (17:09 +0100)]
avutil/utf8: put under #ifdef TEST

All other test programs are under #ifdef TEST too
with the implementation and test code being generally in the same file

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/hnm4video: check intraframe size
Michael Niedermayer [Fri, 22 Nov 2013 15:54:01 +0000 (16:54 +0100)]
avcodec/hnm4video: check intraframe size

Fixes hypothetical integer overflow with HNM4_CHUNK_ID_IZ

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/mjpegdec: check len in mjpeg_decode_app() more completely
Michael Niedermayer [Fri, 22 Nov 2013 15:51:07 +0000 (16:51 +0100)]
avcodec/mjpegdec: check len in mjpeg_decode_app() more completely

Avoids len from becoming negative and causing assertion failure

Fixes: signal_sigabrt_7ffff7126425_5140_fd44dc63fa7bdd12ee34fc602231ef02.jpg

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/hnm4video: check that packetsize is at least 8
Michael Niedermayer [Fri, 22 Nov 2013 15:37:50 +0000 (16:37 +0100)]
avcodec/hnm4video: check that packetsize is at least 8

Fixes integer overflow and assertion failure
Fixes: signal_sigabrt_7ffff7126425_1243_CASSE.HNM

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/avidec: Dont assert the existence of an index for video streams.
Michael Niedermayer [Fri, 22 Nov 2013 14:08:04 +0000 (15:08 +0100)]
avformat/avidec: Dont assert the existence of an index for video streams.

Its possible in various rare cases that an index cannot be created or allocated.
Fixes assertion failure
Fixes: signal_sigabrt_7ffff7126425_7712_pokem.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffprobe: remove various useless ","
Stefano Sabatini [Fri, 22 Nov 2013 15:58:24 +0000 (16:58 +0100)]
ffprobe: remove various useless ","

Nitted-By: ubitux
7 years agoffprobe: implement string validation setting
Stefano Sabatini [Wed, 2 Oct 2013 14:22:17 +0000 (16:22 +0200)]
ffprobe: implement string validation setting

This should fix trac tickets #1163, #2502.

7 years agoffprobe: add support for nested options in writer contexts
Stefano Sabatini [Wed, 20 Nov 2013 14:30:47 +0000 (15:30 +0100)]
ffprobe: add support for nested options in writer contexts

7 years agoffprobe: check for errors, and abort immediately
Stefano Sabatini [Wed, 2 Oct 2013 14:55:15 +0000 (16:55 +0200)]
ffprobe: check for errors, and abort immediately

This allows to make use of validation features.

7 years agolavu/avstring: add av_utf8_decode() function
Stefano Sabatini [Wed, 2 Oct 2013 23:21:40 +0000 (01:21 +0200)]
lavu/avstring: add av_utf8_decode() function

7 years agolavu/dict.h: extend/clarify docs for av_dict_parse_string()
Stefano Sabatini [Wed, 20 Nov 2013 14:28:17 +0000 (15:28 +0100)]
lavu/dict.h: extend/clarify docs for av_dict_parse_string()

7 years agolavu/dict.h: apply various fixes/extensions to doxy
Stefano Sabatini [Wed, 20 Nov 2013 14:08:32 +0000 (15:08 +0100)]
lavu/dict.h: apply various fixes/extensions to doxy

In particular, document AV_DICT_MATCH_CASE, AV_DICT_IGNORE_SUFFIX, and
extend documentation for av_dict_get().

7 years agodoc/encoders/libfdk_aac: state that VBR support is experimental
Stefano Sabatini [Fri, 22 Nov 2013 13:42:31 +0000 (14:42 +0100)]
doc/encoders/libfdk_aac: state that VBR support is experimental

7 years agodoc/encoders/libfdk_aac: fix a few typos
Stefano Sabatini [Fri, 22 Nov 2013 13:54:40 +0000 (14:54 +0100)]
doc/encoders/libfdk_aac: fix a few typos

7 years agodoc/encoders/libfdk_aac: use @ref to reference libfaac
Stefano Sabatini [Fri, 22 Nov 2013 13:40:45 +0000 (14:40 +0100)]
doc/encoders/libfdk_aac: use @ref to reference libfaac

7 years agohls: Avoid reading outside of the allocated array
Martin Storsjö [Thu, 21 Nov 2013 09:53:58 +0000 (11:53 +0200)]
hls: Avoid reading outside of the allocated array

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agohls: Check whether the AVIOContext contains a new redirected URL
Martin Storsjö [Thu, 21 Nov 2013 09:31:53 +0000 (11:31 +0200)]
hls: Check whether the AVIOContext contains a new redirected URL

This allows both the main playlist itself as well as the variant
playlists to handle redirects combined with relative URLs.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agohttp: Expose the content location via an AVOption
Martin Storsjö [Thu, 21 Nov 2013 09:25:16 +0000 (11:25 +0200)]
http: Expose the content location via an AVOption

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agohttp: Support relative URL redirection
Zhang Rui [Thu, 4 Jul 2013 09:18:52 +0000 (17:18 +0800)]
http: Support relative URL redirection

In RFC 2616, this was explicitly said to be an absolute URL,
while in an upcoming draft [1] it is allowed to be relative as well.

[1] http://tools.ietf.org/html/draft-ietf-httpbis-p2-semantics-25#section-7.1.2

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agohttp: Remove an unrelated and mistakenly set AVOption unit name
Martin Storsjö [Wed, 20 Nov 2013 12:53:56 +0000 (14:53 +0200)]
http: Remove an unrelated and mistakenly set AVOption unit name

This was due to a copypaste oversight.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 22 Nov 2013 11:52:10 +0000 (12:52 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aacps: Adjust some const qualifiers to suppress warnings

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '430d12196432ded13f011a3bf7690f03c9b2e5d6'
Michael Niedermayer [Fri, 22 Nov 2013 11:51:00 +0000 (12:51 +0100)]
Merge commit '430d12196432ded13f011a3bf7690f03c9b2e5d6'

* commit '430d12196432ded13f011a3bf7690f03c9b2e5d6':
  pcx: round up in bits->bytes conversion in a buffer size check

Conflicts:
libavcodec/pcx.c

See: 6462268e74fa2c935c2936904cc1da9f499c04f3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'c918e08b9cc9ce8d06159c51da55ec5ab018039a'
Michael Niedermayer [Fri, 22 Nov 2013 11:39:48 +0000 (12:39 +0100)]
Merge commit 'c918e08b9cc9ce8d06159c51da55ec5ab018039a'

* commit 'c918e08b9cc9ce8d06159c51da55ec5ab018039a':
  truemotion1: make sure index does not go out of bounds

See: fd4c1c0b70b5a06dd572d7e27799a2f4c3d9b984
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'ce9bba5340a5fb6f38974a19af019dd6aa2da035'
Michael Niedermayer [Fri, 22 Nov 2013 11:35:55 +0000 (12:35 +0100)]
Merge commit 'ce9bba5340a5fb6f38974a19af019dd6aa2da035'

* commit 'ce9bba5340a5fb6f38974a19af019dd6aa2da035':
  avidec: fix a memleak in the dv init code.

Conflicts:
libavformat/avidec.c

See: 8993c256950067f29bc750140514ef6a1f5fd05d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'de4ec972c06d9047bc1b73bb13f858a5d77d8df0'
Michael Niedermayer [Fri, 22 Nov 2013 11:28:49 +0000 (12:28 +0100)]
Merge commit 'de4ec972c06d9047bc1b73bb13f858a5d77d8df0'

* commit 'de4ec972c06d9047bc1b73bb13f858a5d77d8df0':
  vc1: fix a memleak.

Conflicts:
libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'ca41c72c6d9515d9045bd3b68104525dee81b8d0'
Michael Niedermayer [Fri, 22 Nov 2013 11:10:17 +0000 (12:10 +0100)]
Merge commit 'ca41c72c6d9515d9045bd3b68104525dee81b8d0'

* commit 'ca41c72c6d9515d9045bd3b68104525dee81b8d0':
  motionpixels: clip VLC codes.

Not merged, the change is wrong, the condition is not possible unless
there are serious bugs elsewhere. No such bugs should exist in ffmpeg.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '8b516f154a0a08655cec2d13d12aadc58cae0b1c'
Michael Niedermayer [Fri, 22 Nov 2013 11:08:40 +0000 (12:08 +0100)]
Merge commit '8b516f154a0a08655cec2d13d12aadc58cae0b1c'

* commit '8b516f154a0a08655cec2d13d12aadc58cae0b1c':
  matroskadec: use correct compression parameters for current track CodecPrivate

See: dc6c36ce46d4c4d7cb63503afc2ee44f00bf3725
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '30be1ea33e5525266ad871bed60b1893a53caeaf'
Michael Niedermayer [Fri, 22 Nov 2013 11:02:50 +0000 (12:02 +0100)]
Merge commit '30be1ea33e5525266ad871bed60b1893a53caeaf'

* commit '30be1ea33e5525266ad871bed60b1893a53caeaf':
  matroskadec: pad EBML_BIN data.

Conflicts:
libavformat/matroskadec.c

See: c63e76ba3553d7635b92ac3801f3087e85a76bfb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'f0259a587ee3419dd894873ea617b4c98eeaca1c'
Michael Niedermayer [Fri, 22 Nov 2013 10:55:56 +0000 (11:55 +0100)]
Merge commit 'f0259a587ee3419dd894873ea617b4c98eeaca1c'

* commit 'f0259a587ee3419dd894873ea617b4c98eeaca1c':
  h264: check buffer size before accessing it

Conflicts:
libavcodec/h264.c

See: ea0ac11e52b9cf5264f3d4eb7543e760c2a5fbb4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '1f3e56b6dcc163a705704e98569d4850a31d651c'
Michael Niedermayer [Fri, 22 Nov 2013 10:39:00 +0000 (11:39 +0100)]
Merge commit '1f3e56b6dcc163a705704e98569d4850a31d651c'

* commit '1f3e56b6dcc163a705704e98569d4850a31d651c':
  gifdec: convert to bytestream2

Conflicts:
libavcodec/gifdec.c
libavcodec/lzw.c
libavcodec/lzw.h

See: 3fd60d804996031ceaba9cad0b38652b92551eb0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/gifdec: print error if image is not within dimensions
Michael Niedermayer [Fri, 22 Nov 2013 10:00:02 +0000 (11:00 +0100)]
avcodec/gifdec: print error if image is not within dimensions

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