generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
54,040 Commits 24 Branches 241 Tags 173 MiB
1bb005ce54
Commit Graph

54040 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
9c9d2e9c77 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rtpdec: Fix the alphabetical ordering in registering depacketizers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-07 10:17:20 +02:00
Michael Niedermayer
a18bf95a8e Merge commit '2681924b0f3f35840dd9d9825df9f9239c448b22' 
* commit '2681924b0f3f35840dd9d9825df9f9239c448b22':
  libavformat: Fix standalone compilation of the webm muxer

Conflicts:
	libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-07 10:12:46 +02:00
Clément Bœsch
f97e28ebe5 lavfi/lut3d: add sanity checks. 
Should fix CID1026775 and CID1026774.
 2013-06-07 01:48:41 +02:00
Carl Eugen Hoyos
d5978c8678 Add unscaled converter from GBRP > 8bit to RGBx48/64. 
Fixes ticket #2633.

Tested-by: Michael Cinquin
 2013-06-06 23:57:50 +02:00
Paul B Mahol
86005184e3 tiff: simplify picking right pixel format 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-06 21:42:02 +00:00
Paul B Mahol
61d900fd0d lavc: add ONLY_IF_THREADS_ENABLED where it is missing 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-06 20:17:36 +00:00
Michael Niedermayer
ffb1051b9b jpeg2000: Zero prec->cblk 
Prevent use of uninitialized memory / valgrind failure

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-06 22:02:54 +02:00
Michael Niedermayer
7c3a296b4f jpeg2000dec: fix av_log() 
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-06 21:52:49 +02:00
Paul B Mahol
8cc8adaa88 tiff: correctly decode saparate planes with horizontal differencing predictor 
Closes #2648.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-06 19:47:46 +00:00
Clément Bœsch
00f4998997 lavf/tee: pesudo → pseudo. 2013-06-06 20:29:38 +02:00
Paul B Mahol
3554238863 lavfi/il: add timeline support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-06 17:44:54 +00:00
Paul B Mahol
7d01533371 lavfi/framestep: cosmetics: reindent AVFilter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-06 17:19:16 +00:00
Paul B Mahol
27d3d61343 lavfi/framestep: add timeline support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-06 17:17:14 +00:00
Martin Storsjö
aa2c918f7d rtpdec: Fix the alphabetical ordering in registering depacketizers 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-06-06 19:56:05 +03:00
Martin Storsjö
2681924b0f libavformat: Fix standalone compilation of the webm muxer 
The missing object file was added to the matroska muxer already, but
not to the webm muxer.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-06-06 19:55:53 +03:00
James Almer
b06717ef40 APIchanges: Add missing entry for SHA-2 512 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-06 18:13:06 +02:00
Stefano Sabatini
4da5402256 ffprobe: show chapter and chapter metadata information 
Address trac ticket #2636.
 2013-06-06 16:49:53 +02:00
Michael Niedermayer
21d0f75f29 jpeg2000dec: check that we have enough components for MCT 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-06 16:06:48 +02:00
Michael Niedermayer
c49d94487c jpeg2000dec: Use the matching coding style struct for transform selection 
Fixes a null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-06 15:38:05 +02:00
Carl Eugen Hoyos
75b9fb27f5 lavf/hlsenc: fix bogus hls segment index rewrapping logic 
The counter should not be reset since it detects the
hls segment increasing timeframe.

Fixes ticket #2643.

Reviewed-by: Stefano Sabatini
 2013-06-06 12:09:38 +02:00
Michael Niedermayer
b26bcd08e6 jpeg2000dec: Check that theres a SOT before SOD 
Fixes out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-06 10:51:07 +02:00
Michael Niedermayer
c51654fbc0 jpeg2000dec: Support 4 tile parts 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-06 03:10:42 +02:00
Paul B Mahol
a28f4fd1ea flacdec: don't call allocate_buffers() in init_thread_copy() when s->max_blocksize is 0 
This is normal, and happens when no extradata was available at decoder
initialization.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-06 01:06:45 +00:00
Michael Niedermayer
c59ce1c98e get_qcc: Check compno 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-06 02:26:22 +02:00
Paul B Mahol
b28851a1d6 alac: frame multi-threading support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-05 22:35:32 +00:00
Paul B Mahol
9684d7f1a2 wavpack: frame multi-threading support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-05 22:35:32 +00:00
Paul B Mahol
495db0e3b0 ttadec: frame multi-threading support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-05 22:35:32 +00:00
Paul B Mahol
9300de0409 flacdec: frame multi-threading support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-05 22:35:31 +00:00
Paul B Mahol
d97044640c takdec: frame multi-threading support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-05 22:35:31 +00:00
Paul B Mahol
d5f7f1fef1 audio frame multi-threaded decoding 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-05 22:35:31 +00:00
Michael Niedermayer
258a05b216 MAINTAINERS: add fingerprint of the FFmpeg release signing key 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 23:31:19 +02:00
Michael Niedermayer
bbc19010ed jpeg2000dec: return error for invalid cdxy values 
Fixes division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 23:31:19 +02:00
Stefano Sabatini
702c1bf240 Changelog: add missing entries about new mcdeint and sab filters 2013-06-05 19:35:37 +02:00
Michael Niedermayer
2c2a8f70f5 jpeg2000: Make nreslevel fields int 
This prevents potential integer overflows

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 18:34:07 +02:00
Michael Niedermayer
66c4d54413 jpeg2000dec: Propagate error code from get_cox() correctly 
Without this the context state could become inconsistent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 18:34:07 +02:00
Michael Niedermayer
6e9bfc19bd jpeg2000: check that nreslevels2decode has been initialized before use 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 18:34:07 +02:00
Michael Niedermayer
16f3102f41 avformat/img2dec: timestamps are 64bit 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 14:41:16 +02:00
Michael Niedermayer
fbc472da29 avutil/mem: simplify av_reallocp_array() by using av_realloc_f() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 14:40:31 +02:00
Michael Niedermayer
21bf0d6f80 avformat/network: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 14:29:04 +02:00
Michael Niedermayer
856e7dbb72 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  apetag: use int64_t for filesize

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 12:25:16 +02:00
Michael Niedermayer
4abd5a4318 Merge commit '274e134e49b1c92db0f0b8cb2ae7554fb7b9184c' 
* commit '274e134e49b1c92db0f0b8cb2ae7554fb7b9184c':
  avconv: check that the output format context exists before accessing it

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 12:20:26 +02:00
Michael Niedermayer
2280b539c5 Merge commit '8b7dffc2d6c6c19f8e0a1fedcd0e95dce7a273ff' 
* commit '8b7dffc2d6c6c19f8e0a1fedcd0e95dce7a273ff':
  lavfi doxy: improve/extend AVFilter doxy.

Conflicts:
	libavfilter/avfilter.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 12:05:41 +02:00
Michael Niedermayer
82070b01b8 Merge commit '9835abb6d63fb07613994ae90e72fef758149408' 
* commit '9835abb6d63fb07613994ae90e72fef758149408':
  network: uniform ff_listen_bind and ff_listen_connect

Conflicts:
	libavformat/network.c
	libavformat/tcp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 11:56:56 +02:00
Michael Niedermayer
606e8baf0f Merge commit '7c020e1ad37d27c9d5db4d714401f09c80e3cc44' 
* commit '7c020e1ad37d27c9d5db4d714401f09c80e3cc44':
  movenc: Grow the frag_info array in chunks

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 11:33:25 +02:00
Michael Niedermayer
28ce9c0b73 Merge commit 'ab1189766a82a95f108005463cde75f73fcc0ae5' 
* commit 'ab1189766a82a95f108005463cde75f73fcc0ae5':
  movenc: Increase the cluster array allocation by doubling

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 11:26:32 +02:00
Michael Niedermayer
30b491f1c9 Merge commit '3b4feac1ec14f861bdd7f494f288f4d8dd7f449e' 
* commit '3b4feac1ec14f861bdd7f494f288f4d8dd7f449e':
  movenc: Keep track of the allocated size for the cluster array
  mem: Add av_realloc_array and av_reallocp_array

Conflicts:
	doc/APIchanges
	libavformat/movenc.c
	libavutil/mem.c
	libavutil/mem.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 11:19:16 +02:00
Timothy Gu
ea038b996d doc/encoders: add documentation for libtwolame 2013-06-05 08:33:13 +00:00
Michael Niedermayer
3289670142 swr: dont treat 32 and 24 as equal in simple copy check 
Fixes dithering from 32 to 24 bit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 03:06:34 +02:00
Michael Niedermayer
6bc4e36ba7 swr: set scale for 32->32/24 dither 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 03:06:34 +02:00
Stefano Sabatini
449558d34a lavfi/mp: remove mp=sab 
The filter was ported to a native libavfilter filter.
 2013-06-05 00:06:51 +02:00