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
54,802 Commits 37 Branches 400 Tags 460 MiB
99de97cabf
Commit Graph

54802 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
5698f6bd73 Merge commit '04e9853a210e07b1a150aa2b8e9af0aa3601ff21' 
* commit '04e9853a210e07b1a150aa2b8e9af0aa3601ff21':
  wmavoice: return meaningful error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-11 11:33:19 +02:00
Michael Niedermayer
2efc2b53be Merge commit '7d65e960c72f36b73ae7fe84f8e427d758e61da9' 
* commit '7d65e960c72f36b73ae7fe84f8e427d758e61da9':
  iff: Do not read over the source buffer

Conflicts:
	libavcodec/iff.c

See: 2fbb37b51b

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-11 11:32:36 +02:00
Michael Niedermayer
56090b5b80 Merge commit '3865ba7b21aef5d60183719e238361ec8797ab5a' 
* commit '3865ba7b21aef5d60183719e238361ec8797ab5a':
  iff: K&R formatting cosmetics

Conflicts:
	libavcodec/iff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-11 11:12:48 +02:00
Michael Niedermayer
15cee5e562 mjpegdec: Fix used quant index for gbr 
Fixes Ticket1651

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-11 02:31:58 +02:00
Michael Niedermayer
94e86ae15a mjpegdec: initialize source variables before gbr remap 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-11 02:31:58 +02:00
Stefano Sabatini
71a2e5245c lavf/segment: use AV_OPT_TIME_DURATION for time_delta 
Simplify.
 2013-07-11 00:36:53 +02:00
Stefano Sabatini
459dc81a64 lavf/segment: reindent after last commit 2013-07-11 00:36:41 +02:00
Stefano Sabatini
19ea08a11a lavf/segment: add initial_offset option 
Should address trac ticket #2224.
 2013-07-11 00:36:24 +02:00
Stefano Sabatini
b3ac8a2a60 doc/formats: add section describing stream specifiers 2013-07-11 00:35:35 +02:00
Stefano Sabatini
e7a6962e76 doc/developer: update sections about external development 
Replace the sections "API" and "Integrating libavcodec or libavformat"
with updated / more accurate text.

See thread:
Subject: [FFmpeg-devel] [PATCH] doc/developer: merge and update sections about external development
Date: Fri,  5 Jul 2013 11:07:07 +0200
 2013-07-11 00:01:19 +02:00
Paul B Mahol
db4e191d88 lavfi/aevalsrc: do not free AVOption variables in uninit() 
The generic code frees them already.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-10 19:22:07 +00:00
Paul B Mahol
badbd2414d lavfi/aevalsrc: use AV_OPT_TYPE_DURATION 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-10 19:16:00 +00:00
Paul B Mahol
1e89f74902 lavfi/afade: use av_rescale() 
Should not make a difference, but its good idea.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-10 19:13:28 +00:00
Derek Buitenhuis
2ea60971dc fate: Always enable avresample 
There's no reason we shouldn't be testing it.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-07-10 15:12:05 -04:00
Paul B Mahol
4511973901 wmalosslessdec: do not set avctx->coded_frame 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-10 19:11:12 +00:00
Michael Niedermayer
07206deed1 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Suggest recompilation with openssl or gnutls if the https protocol is not found.
  lavf/utils.c: Avoid a null pointer dereference on oom after duration_error allocation.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 19:58:19 +02:00
Michael Niedermayer
0a3a0edd52 avfilter/af_earwax: Fix out of array accesses on odd packets 
Found-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 16:46:13 +02:00
Michael Niedermayer
8f09957194 avcodec/qdm2: initialize sign_bits 
Fixes non deterministic output

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 16:21:33 +02:00
Carl Eugen Hoyos
1db88c33f2 Suggest recompilation with openssl or gnutls if the https protocol is not found. 
Fixes ticket #2765.
 2013-07-10 16:20:40 +02:00
Carl Eugen Hoyos
c9eb5c9751 lavf/utils.c: Avoid a null pointer dereference on oom after duration_error allocation. 2013-07-10 16:20:40 +02:00
Michael Niedermayer
fbe159e850 avcodec/qdm2: store bits in an integer instead of float variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 16:18:52 +02:00
Piotr Bandurski
b050956334 avformat/utils: avformat_find_stream_info set value for ret in case of oom 
without it FFmpeg didn't display any error message when oom event occured

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 16:07:45 +02:00
Michael Niedermayer
2e6338b472 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  qdm2: Conceal broken samples

See: 5ee008e01d

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 16:00:57 +02:00
Luca Barbato
d14a26edb7 wmavoice: conceal clearly corrupted blocks 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-10 15:50:06 +02:00
Luca Barbato
f5c48f5ada wmavoice: use init_static_data 2013-07-10 15:49:58 +02:00
Luca Barbato
04e9853a21 wmavoice: return meaningful error codes 2013-07-10 15:49:51 +02:00
Luca Barbato
7d65e960c7 iff: Do not read over the source buffer 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-10 15:24:42 +02:00
Luca Barbato
3865ba7b21 iff: K&R formatting cosmetics 2013-07-10 15:23:51 +02:00
Paul B Mahol
bc95b94289 lavfi/aconvert: unbreak 
Even if its deprecated, it should still work correctly.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-10 13:16:24 +00:00
Michael Niedermayer
564909093a Merge commit 'adadc3f2443d25b375e21e801516ccfd78e0b080' 
* commit 'adadc3f2443d25b375e21e801516ccfd78e0b080':
  qdm2: refactor joined stereo support

Conflicts:
	libavcodec/qdm2.c

See: 2b12d1ffd8

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 15:07:20 +02:00
Michael Niedermayer
2c0ec526e2 fate/crc fix after master:410192e36958: add crc24 tables 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 14:58:52 +02:00
Paul B Mahol
884c890535 lavfi: add aecho filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-10 12:10:58 +00:00
Paul B Mahol
4977e467a5 lavf/takdec: check metadata blocks checksum 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-10 12:07:53 +00:00
Paul B Mahol
8491f40500 tak: use crc table from lavu 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-10 12:07:53 +00:00
Paul B Mahol
410192e369 add crc24 tables 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-10 12:07:53 +00:00
Michael Niedermayer
067c9c3b63 Merge commit '12576afe206d35231ccd61f9033c5fdab6a11e80' 
* commit '12576afe206d35231ccd61f9033c5fdab6a11e80':
  adpcm: Write the correct number of samples for ima-dk4

Conflicts:
	libavcodec/adpcm.c

See: f18c873ab5

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 12:56:55 +02:00
Michael Niedermayer
a3d9a21683 Merge commit 'bbf6a4aa20bfe3d7869b2218e66063602dfb8aa7' 
* commit 'bbf6a4aa20bfe3d7869b2218e66063602dfb8aa7':
  imc: Catch a division by zero
  atrac3: Error on impossible encoding/channel combinations

See: 13451f5520

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 12:28:07 +02:00
Michael Niedermayer
40e8967ee1 Merge commit '22e76ec635bafdd1d1ec35581a7ac09e69e3c43e' 
* commit '22e76ec635bafdd1d1ec35581a7ac09e69e3c43e':
  atrac3: set the getbits context the right buffer_end
  atrac3: fix error handling

Conflicts:
	libavcodec/atrac3.c

No change as these issues have been fixed previously
See: c8f25cafd2
See: 5eaed6d336

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 12:23:17 +02:00
Piotr Bandurski
ccf9211e29 avformat/utils: avformat_find_stream_info fix a crash in case of oom 
fixes ticket #2767

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 03:42:06 +02:00
Michael Niedermayer
0574fe76b8 Changelog: add back the <next> placeholder for new changes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 03:14:33 +02:00
Michael Niedermayer
a37e42b3ee Update back for git master 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 03:14:23 +02:00
Michael Niedermayer
2b8b2ba19f Changelog: replace next by 2.0 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 02:47:10 +02:00
Michael Niedermayer
1ebb95d5f1 Update for 2.0 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 02:15:43 +02:00
Luca Barbato
5eaed6d336 atrac3: fix error handling 
decode_tonal_components returns a proper AVERROR.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 02:15:43 +02:00
Eugene Dzhurinsky
09f59d6adf avformat/gif: Do not write GIF89a header if loop is set to -1. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 01:18:59 +02:00
Michael Niedermayer
9e214900ad Merge remote-tracking branch 'cus/stable' 
* cus/stable:
  ffplay: assume 0 stream start time if start time is unset in duration check
  ffplay: do not update audio clock with old audio pts if current frame is AV_NOPTS_VALUE

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 00:57:04 +02:00
Michael Niedermayer
49f441ea89 MAINTAINERS: Update which releases are supported 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 00:47:01 +02:00
Alexis Ballier
c3ca70204b codec_desc: fix typo in rv20 long_name. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 00:27:34 +02:00
Michael Niedermayer
3aa2257d24 doc/RELEASE_NOTES: add a note about AVISynth 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 00:24:04 +02:00
Michael Niedermayer
233177a4ec jpegdec: clear EOBRUN on restarts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 23:49:06 +02:00