virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
58,470 Commits 37 Branches 400 Tags 460 MiB
75ec40b083
Commit Graph

58470 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
75ec40b083 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>
 2013-11-26 13:13:45 +01:00
Michael Niedermayer
625b29037e 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>
 2013-11-26 13:00:46 +01:00
Michael Niedermayer
cd51d9a984 Revert "avcodec/gsmdec: reject unsupported msn audio modes" 
they should be supported now

This reverts commit 1ee1a3d9f4.
 2013-11-26 12:38:03 +01:00
Michael Niedermayer
8c87658fdc Merge commit 'a16577d9857206089fd8bce6a342b31dbd7fb9b0' 
* commit 'a16577d9857206089fd8bce6a342b31dbd7fb9b0':
  MSN Audio support

Conflicts:
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-26 12:37:20 +01:00
Michael Niedermayer
ac021fdc40 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>
 2013-11-26 12:28:31 +01:00
Michael Niedermayer
0290a646ac 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>
 2013-11-26 12:23:39 +01:00
Stefano Sabatini
8bf7ea8ac2 cmdutils: remove this_year constant, use CONFIG_THIS_YEAR instead 
Simplify.
 2013-11-26 10:03:32 +01:00
Stefano Sabatini
4c4710a745 configure: define CONFIG_THIS_YEAR at the configure level 
The macro value can be shared between configure script and cmdutils.c.
 2013-11-26 09:54:40 +01:00
Anton Khirnov
c6080d8900 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.
 2013-11-26 09:27:50 +01:00
John Stebbins
1eaac1d6f7 mpeg12dec: Extract CC user data into frame side data 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-26 08:37:22 +01:00
Kostya Shishkov
a16577d985 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>
 2013-11-26 08:31:10 +01:00
Kostya Shishkov
56d061ce9d metasound: add last missing modes (8kHz @ 6kbps per channel) 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-26 08:29:42 +01:00
Michael Niedermayer
a9a3afec1a 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>
 2013-11-26 02:15:47 +01:00
Michael Niedermayer
f1db007e00 doc/Makefile fix PROGS 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-26 02:06:59 +01:00
Michael Niedermayer
325c918fa3 Makefile: Fix building progs out of progs_g 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-26 02:06:41 +01:00
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

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
 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
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 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
Some scripts make use of --disable-doc

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 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
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 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