RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
54,066 Commits 37 Branches 400 Tags 266 MiB
Commit Graph

54066 Commits

Author SHA1 Message Date
Lukasz Marek bc29acdc76 ftp: explicit return code checks 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2013-06-08 03:54:55 +02:00
Lukasz Marek 43eda88200 ftp: fix flush control connection input 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2013-06-08 03:54:55 +02:00
Lukasz Marek 23a76b71de ftp: reconnect on tcp read error 
This commit reconnect both connections and retries before ftp_read returns an error.
Practical use case: resume after lock screen on iOS devices.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2013-06-08 03:54:55 +02:00
Michael Niedermayer 56abad0ee4 avcodec/smvjpegdec: copy palette too 
Fixes out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-08 01:20:55 +02:00
Michael Niedermayer 5b9917ec2b Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Do not offer smvjpeg lowres capabilities, the decoder does not support it.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-07 21:38:54 +02:00
Michael Niedermayer 467e7a8f26 avcodec/smvjpegdec: check that frames_per_jpeg cleanly divides height 
Fixes out of array access

If some valid files fail this check then please open a ticket and ping me and the smvjpegdec maintainer.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-07 20:39:05 +02:00
Carl Eugen Hoyos 7ce011e054 Do not offer smvjpeg lowres capabilities, the decoder does not support it. 
Reviewed-by: Ash Hughes
 2013-06-07 19:40:03 +02:00
Luca Barbato a3b2b83f01 faxcompr: return meaningful errors 
And optionally forward them to the caller instead of concealing them.

Unify err and ret in a single variable.
 2013-06-07 17:23:53 +02:00
Luca Barbato f32aefcf34 faxcompr: K&R formatting cosmetics 2013-06-07 17:23:53 +02:00
Luca Barbato 9c22169769 tiff: do not overread the source buffer 
At least 2 bytes from the source are read every loop.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-06-07 17:23:53 +02:00
Luca Barbato 999ccd2d0a tiff: cleanup the error paths 
Return the proper error values and optionally report them.
 2013-06-07 17:23:53 +02:00
Luca Barbato 016c5b066d tiff: refactor fax support in a separate function 2013-06-07 17:23:53 +02:00
Luca Barbato 103937681d tiff: refactor deflate support in a separate function 
Report when zlib support is missing.
 2013-06-07 17:23:53 +02:00
Luca Barbato f8a4d5e970 h264_parser: K&R formatting cosmetics 2013-06-07 16:54:55 +02:00
Luca Barbato 92b3caa108 vorbis: return meaningful errors 2013-06-07 16:54:16 +02:00
Tim.Nicholson 0ea1356137 doc/filters: fix alias option name for chroma_mode in 'il' filter. 2013-06-07 16:34:00 +02:00
Alexandre Sicard 8912029031 avformat/mov: compute dts_shift with trun cts 
Some movies have negative composition time offsets in their trun, causing pts <
dts errors. This patch makes use of dts_shift to handle them.

Signed-off-by: Alexandre Sicard <alexandre.sicard@smartjog.com>
 2013-06-07 16:30:27 +02:00
Paul B Mahol c59c0488ec cmdutils: print threading capabilities for audio codecs 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-07 14:24:52 +00:00
Michael Niedermayer bce2ed5559 smvjpegdec: only extract picture when a picture has been decoded. 
Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-07 14:36:45 +02:00
Paul B Mahol 369684f109 tta: unbreak demuxing of files with id3 tags at start of file 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-07 10:39:21 +00:00
Paul B Mahol 5bafe0ce44 tta: replace datalen with nb_samples 
This is less confusing.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-07 09:49:04 +00:00
Paul B Mahol dc5c029f02 sonicenc: don't allocate unused avctx->coded_frame 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-07 09:29:34 +00:00
Paul B Mahol 5285a7549f pcmenc: don't allocate unused avctx->coded_frame 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-07 09:29:34 +00:00
Paul B Mahol 739d6a78b7 alacenc: don't allocate unused avctx->coded_frame 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-07 09:29:33 +00:00
Paul B Mahol 379fcc4955 id3v2: read all textual chapter subframes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-07 09:28:07 +00:00
Atli Thorbjornsson f3c51215ce flvdec: Fix mistakenly discarding metadata at dts==0 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-07 11:11:59 +02:00
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