RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
54,034 Commits 36 Branches 392 Tags 308 MiB
Commit Graph

54034 Commits

Author SHA1 Message Date
Michael Niedermayer 2a91038e13 avformat/wavdec: Dont rescale timestamps but use exact comparission 
Fixes integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-08 20:02:22 +02:00
Michael Niedermayer 9e9ec5ad2a smvjpegdec: No frame at all is an error 
This fixes a infinite loop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-08 20:02:22 +02:00
Paul B Mahol b94f045b18 wavpack: add missing .\n to entropy error message 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-08 17:39:54 +00:00
Paul B Mahol 9644fc95be matroskadec: move ALAC extradata creation bellow AAC one 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-08 17:39:51 +00:00
Michael Niedermayer 33fb22f800 Merge remote-tracking branch 'lukaszmluki/master' 
* lukaszmluki/master:
  ftp: add invalid code for RETR operation
  ftp: probe seek capability
  ftp: fix seeking beyond file size
  ftp: abort function optimalization
  ftp: explicit return code checks
  ftp: fix flush control connection input
  ftp: reconnect on tcp read error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-08 15:59:12 +02:00
Michael Niedermayer f320b00541 doc/codecs: Mention relation of the experimental setting and codecs 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-08 14:14:27 +02:00
Timothy Gu ba7cb4807f doc/encoders: Add libvo-aacenc doc 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-08 13:52:34 +02:00
Michael Niedermayer f973f17416 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  faxcompr: return meaningful errors

Conflicts:
	libavcodec/faxcompr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-08 12:38:18 +02:00
Michael Niedermayer a5a9bcc876 Merge commit 'f32aefcf349f2f1367f0143782397643416d18f3' 
* commit 'f32aefcf349f2f1367f0143782397643416d18f3':
  faxcompr: K&R formatting cosmetics

Conflicts:
	libavcodec/faxcompr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-08 12:30:15 +02:00
Michael Niedermayer d0b27eab92 Merge commit '9c2216976907336dfae0e8e38a4d70ca2465a92c' 
* commit '9c2216976907336dfae0e8e38a4d70ca2465a92c':
  tiff: do not overread the source buffer

Conflicts:
	libavcodec/tiff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-08 12:21:14 +02:00
Michael Niedermayer dc318505d0 Merge commit '999ccd2d0a43640921088578f138c874f6cc0f8a' 
* commit '999ccd2d0a43640921088578f138c874f6cc0f8a':
  tiff: cleanup the error paths

Conflicts:
	libavcodec/tiff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-08 11:41:58 +02:00
Michael Niedermayer 1fec361f35 Merge commit '016c5b066de08a93a5f6b5beb0ef377356b35cde' 
* commit '016c5b066de08a93a5f6b5beb0ef377356b35cde':
  tiff: refactor fax support in a separate function

Conflicts:
	libavcodec/tiff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-08 11:32:34 +02:00
Michael Niedermayer a804632b15 Merge commit '103937681d7e6afd3e8caf8937272575e450fb55' 
* commit '103937681d7e6afd3e8caf8937272575e450fb55':
  tiff: refactor deflate support in a separate function

Conflicts:
	libavcodec/tiff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-08 11:23:49 +02:00
Michael Niedermayer e2d4bcd7b8 Merge commit 'f8a4d5e970f32f8cc747f9fa7bd975ee4a060ea1' 
* commit 'f8a4d5e970f32f8cc747f9fa7bd975ee4a060ea1':
  h264_parser: K&R formatting cosmetics
  vorbis: return meaningful errors

Conflicts:
	libavcodec/h264_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-08 10:50:24 +02:00
Lukasz Marek ff35c7cdfa ftp: add invalid code for RETR operation 
554 is possible invalid code:
- Restart not valid
- Command terminated due to server shutdown in progress
- etc...

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2013-06-08 04:17:34 +02:00
Lukasz Marek 89b4800eef ftp: probe seek capability 
Make FTP streamed when server doesn't accept REST command

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2013-06-08 04:17:34 +02:00
Lukasz Marek eeedca4b7f ftp: fix seeking beyond file size 
adjust to ff* tools seek nature

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2013-06-08 04:17:33 +02:00
Lukasz Marek 4d617715c9 ftp: abort function optimalization 
It seems some ftp servers doesn't respect ABOR command,
but closing both connection is slow.

This commit keeps control connection open when possible.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2013-06-08 04:17:26 +02:00
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