Michael Niedermayer
6d34aa245d
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>
2013-11-26 01:31:00 +01:00
Michael Niedermayer
5ded4332f1
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>
2013-11-26 01:12:24 +01:00
Kostya Shishkov
de44dfc7c0
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>
2013-11-26 00:34:12 +01:00
Michael Niedermayer
4782c4284f
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>
2013-11-25 23:17:17 +01:00
Diego Biurrun
5145ccf02b
aacsbr: Add some const casts to silence warnings in ff_sbr_apply()
2013-11-25 21:04:29 +01:00
Diego Biurrun
ab81f24ad4
build: Integrate multilibrary examples into the build system
...
This includes moving libavformat/output-example to doc/examples/output.
2013-11-25 11:57:29 -08:00
Diego Biurrun
14abeaa43d
build: Separate building programs linking against libav* from building av*
...
This will allow cleaner integration of building example programs.
2013-11-25 11:57:29 -08:00
Michael Niedermayer
c3d5cd1ebf
Revert "Merge remote-tracking branch 'qatar/master'" ( 43dec5ef9a)
...
Fixes out of array accesses
Fixes asan_static-oob_eb9812_5961_iv41.avi
This reverts the merge of c9ef6b0932
2013-11-25 19:55:32 +01:00
Marton Balint
a02860351d
ffprobe: add support for subtitle frames
...
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-11-25 19:51:27 +01:00
Stefano Sabatini
c0f2e07135
lavf/segment: add a few log messages when avio_open2() fails
2013-11-25 19:20:11 +01:00
Stefano Sabatini
5e278c19c7
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>.
2013-11-25 19:12:16 +01:00
Vignesh Venkatasubramanian
7f11c530dc
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>
2013-11-25 15:29:49 +01:00
Michael Niedermayer
25010f511c
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
doc: Add the host executable suffix for the print_options dependency
See: d48f014ff1
2013-11-25 11:30:49 +01:00
Martin Storsjö
09cd0a3176
doc: Add the host executable suffix for the print_options dependency
...
This fixes building on windows.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-11-25 11:20:55 +02:00
Hendrik Leppkes
841c0aafa5
avcodec/pthread: check packet buffer allocation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-25 02:22:43 +01:00
James Almer
eff2edae56
Partially revert "Merge commit 'f187557ab4612776f7f527ecf3d40062975c3e4c'"
...
This partially reverts commit c0237d19a0
2013-11-25 01:53:12 +01:00
Stefano Sabatini
5e1c57f5cb
ffplay: do not call avcodec_register_all() explicitly
...
avcodec_register_all() is implicitly called by av_register_all().
2013-11-25 00:03:20 +01:00
Michael Niedermayer
988bda8a69
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
build: Import makedef script from c99-to-c89
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-24 23:27:32 +01:00
Derek Buitenhuis
dedfa00107
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>
2013-11-24 19:36:09 +00:00
Michael Niedermayer
e78d038187
avformat/asfdec: ignore packet_segments
...
Fixes Ticket1708
Based on patch by Alberto Delmás
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-24 20:33:26 +01:00
Alberto Delmás
edf7d15eb0
avformat/asfdec: reset packet_time_start when asf_read_frame_header() failed
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-24 20:33:26 +01:00
Michael Niedermayer
76dad833e9
avformat/asfdec: remove duplicated packet_segments reset
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-24 20:23:22 +01:00
Stefano Sabatini
25c675b5a7
lavd/sdl: do not manually free window_title and icon_title fields
...
They are automatically freed when calling av_write_trailer(). Simplify.
2013-11-24 19:35:36 +01:00
Stefano Sabatini
8446bb33d1
doc/outdevs/sdl: fix confusing text about window_fullscreen default value
2013-11-24 19:35:36 +01:00
Carl Eugen Hoyos
e043298cb1
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 .
2013-11-24 10:37:52 +01:00
Michael Niedermayer
ccdfa3e271
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>
2013-11-24 05:21:19 +01:00
Michael Niedermayer
f67ec7f3a2
Merge commit '0eeeb9647e9c92c9edfd0b18c7cb5da7ac666f85'
...
* commit '0eeeb9647e9c92c9edfd0b18c7cb5da7ac666f85':
mpegaudiodec: Consistently handle fixed/float templating
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-24 05:12:07 +01:00
Michael Niedermayer
ceaaf0d97e
Merge commit '48b24bd2d208ce0f124029ac4c5ac5cb1fca4175'
...
* commit '48b24bd2d208ce0f124029ac4c5ac5cb1fca4175':
ac3dec: Fix out-of-array read
Conflicts:
libavcodec/ac3dec.c
See: 2cbf27b08a
2013-11-24 05:05:09 +01:00
Michael Niedermayer
c0237d19a0
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>
2013-11-24 04:55:35 +01:00
Michael Niedermayer
3d5a5e86be
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>
2013-11-24 04:02:24 +01:00
Paul B Mahol
638d79a9d0
ffprobe: use designated initializer for AVClass
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-11-23 22:23:52 +00:00
Clément Bœsch
bea9394465
avcodec/vp9dsp: remove unused stride parameter in loop_filter().
...
The stride argument is passed either as stridea or strideb.
2013-11-23 22:19:38 +01:00
Diego Biurrun
8f8bc92365
Add missing #includes for *INT64_MAX and *INT64_C
2013-11-23 21:55:52 +01:00
Diego Biurrun
0eeeb9647e
mpegaudiodec: Consistently handle fixed/float templating
2013-11-23 21:36:49 +01:00
Tim Walker
48b24bd2d2
ac3dec: Fix out-of-array read
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-11-23 21:36:49 +01:00
Michael Niedermayer
321b338762
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>
2013-11-23 21:05:29 +01:00
Diego Biurrun
f187557ab4
build: more fine-grained dependencies for documentation build tools
...
Perl is needed to build the manual pages, texi2html for the HTML pages.
2013-11-23 09:45:06 -08:00
James Zern
34e32d6464
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>
2013-11-23 16:59:05 +01:00
James Zern
6819eaf31b
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>
2013-11-23 16:58:03 +01:00
Michael Niedermayer
f63ee2aa14
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>
2013-11-23 14:53:39 +01:00
Michael Niedermayer
3e641b4842
Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'
...
* commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea':
avconv: add support for VDPAU decoding
Conflicts:
Changelog
Makefile
configure
ffmpeg.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-23 14:46:48 +01:00
Michael Niedermayer
62e10c3759
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>
2013-11-23 14:31:15 +01:00
Michael Niedermayer
94194bdcd7
Merge commit 'd4df02131b5522a99a4e6035368484e809706ed5'
...
* commit 'd4df02131b5522a99a4e6035368484e809706ed5':
ac3dec: Remove write-only channel_layout field from AC3DecodeContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-23 13:45:09 +01:00
Michael Niedermayer
2cbf27b08a
libavcodec/ac3dec: fix channel_layout
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-23 13:36:15 +01:00
Michael Niedermayer
2e5780a53f
Merge commit 'b53285462263ef8a795f0e289abd5799b4c57652'
...
* commit 'b53285462263ef8a795f0e289abd5799b4c57652':
ac3: implement request_channel_layout.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-23 12:18:33 +01:00
Michael Niedermayer
8733b363ac
Merge commit 'c16bfb147df8a9d350e8a0dbc01937b78faf5949'
...
* commit 'c16bfb147df8a9d350e8a0dbc01937b78faf5949':
swscale: x86: Consistently use lowercase function name suffixes
Conflicts:
libswscale/x86/rgb2rgb.c
libswscale/x86/swscale.c
See: 1de064e21e
2013-11-23 12:10:40 +01:00
Alexandra Khirnova
6f270da61b
libschroedingerenc: do not assert on values from external libraries
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-23 12:08:53 +01:00
Anton Khirnov
7671dd7cd7
avconv: add support for VDPAU decoding
2013-11-23 11:55:53 +01:00
Anton Khirnov
07fd0a2219
avconv: add infrastructure for using hwaccels
2013-11-23 11:55:43 +01:00
Reimar Döffinger
97a0bad87c
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>
2013-11-23 09:57:38 +01:00
