virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Code Issues Releases Activity
57,679 Commits 37 Branches 400 Tags 460 MiB
7b91e9cf5d
Commit Graph

57679 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
078dab551d Merge commit '529a9893d769f381b72785c500662be2020da5fe' 
* commit '529a9893d769f381b72785c500662be2020da5fe':
  avframe: mark source frame const in _ref and _clone

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 10:28:47 +01:00
Michael Niedermayer
8930637819 Merge commit 'fc06ee6ee377cc3b512dff8f02057e26311bc4da' 
* commit 'fc06ee6ee377cc3b512dff8f02057e26311bc4da':
  mmvideo: fix uninitialized variable use in mm_decode_intra

Conflicts:
	libavcodec/mmvideo.c

See: c2e3b564b3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 10:12:13 +01:00
Michael Niedermayer
b96dddd344 Merge commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5' 
* commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5':
  lavr: check that current_buffer is not NULL before using it

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 09:59:53 +01:00
Stefano Sabatini
6baf9c4406 cmdutils: fix expected signature for show_colors() function 
Fix warning:
In file included from ffprobe.c:2557:0:
cmdutils_common_opts.h:17:5: warning: initialization from incompatible pointer type [enabled by default]
cmdutils_common_opts.h:17:5: warning: (near initialization for ‘real_options[16].u.func_arg’) [enabled by default]

Spotted-by: Paul B Mahol
 2013-10-28 09:41:25 +01:00
Anton Khirnov
a1c5cc429d lavc: don't set AVFrame.pts to random numbers in decoders. 2013-10-28 09:28:29 +01:00
Anton Khirnov
2ba68dd044 lavf: remove unreliable timestamp guessing heuristic 2013-10-28 09:28:19 +01:00
Martin Storsjö
f2521563d1 g722dec: Change bits_per_codeword to the right option type 
This isn't a set of flags but just a plain integer in the range
6-8.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-10-28 09:53:48 +02:00
Vittorio Giovara
884c7a6eb8 avfilter: fix const use of avfilter_next 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-10-28 07:58:23 +01:00
Vittorio Giovara
5c439b41d0 avfilter: have avfilter_get_by_name return const for next bump 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-10-28 07:57:44 +01:00
Anton Khirnov
97de206b44 lavc: disable CRC checking by default 2013-10-28 07:22:43 +01:00
Anton Khirnov
23a211cbba lavc: change all decoders to behave consistently with AV_EF_CRCCHECK. 
Just crccheck prints a warning, crccheck+explode returns an error.

Also document this behavior.
 2013-10-28 07:22:18 +01:00
Anton Khirnov
f354f30836 error resilience: check error_concealment, not err_recognition. 
err_recognition is supposed to trigger detecting and reporting errors,
not trying to fix them.
 2013-10-28 07:22:11 +01:00
Michael Niedermayer
0fef19b15a doc/RELEASE_NOTES: update for 2.1 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 01:13:46 +01:00
Michael Niedermayer
d041f12513 avdevice/pulse_audio_enc: remove double ; 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 00:52:11 +01:00
Michael Niedermayer
b85bf3423c doc/APIchanges: add 2 missing hashes & versions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 00:45:19 +01:00
Michael Niedermayer
f11a917ac0 MAINTAINERS: update which releases i maintain 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 00:40:15 +01:00
Michael Niedermayer
72d1f668c4 Changelog: add 2.1 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 00:39:34 +01:00
Luca Barbato
53151723e3 avio: K&R formatting cosmetics 2013-10-28 00:04:50 +01:00
Michael Niedermayer
aaaf2dc023 h263: Check init_get_bits return value 
And use init_get_bits8 to check for integer overflows while at it.

CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-10-28 00:04:49 +01:00
Luca Barbato
0749314886 h263: Return meaningful errors 2013-10-28 00:04:49 +01:00
Luca Barbato
de6061203e configure: Disable -Wmaybe-uninitialized by default 
It is by definition unreliable and causes pointless noise on valid
code.
 2013-10-28 00:04:49 +01:00
Mickaël Raulet
0ddd3c5ba6 hevc: add decode hrd 
(cherry picked from commit ab4061dff796b1dd2bc884101226aab48c2c875e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-27 23:50:35 +01:00
Anton Khirnov
2f77894ccc hevc: better mt implementation 
Signed-off-by: Mickaël Raulet <mraulet@insa-rennes.fr>
(cherry picked from commit 93afb8c519deca85b3c97804927de5b016dd32d1)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-27 23:49:50 +01:00
Mickaël Raulet
c1882e801d hevc: clean up mvs(cherry picked from commit 955317c09b877a513d3fcfcd1615909b2f4f651c) 
Decreases the difference to Anton Khirnovs patch v5

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-27 23:48:43 +01:00
Mickaël Raulet
2707cca78f hevc: cosmetic change(cherry picked from commit 3b57513b3f39c04337801fb9d159c7ca8dfa9deb) 
Decreases the difference to Anton Khirnovs patch v5

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-27 23:48:11 +01:00
Mickaël Raulet
3106cbd321 hevc: more cosmetic(cherry picked from commit 9697abe41daa234602915f85bf6b1c0ca0252cff) 
Decreases the difference to Anton Khirnovs patch v5

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-27 23:46:54 +01:00
Mickaël Raulet
3c3ece24ea hevc : cosmetic changes(cherry picked from commit 7308c0ccf13f18cebe4851e6dcd6b5c0b09be1dd) 
Decreases the difference to Anton Khirnovs patch v5

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-27 23:45:34 +01:00
Marton Balint
dbe6f9f2c2 lavc: add support for CODEC_CAP_DELAY in subtitles 
This patch adds CODEC_CAP_DELAY support to avcodec_decode_subtitle2.

For DVB teletext decoding, a single teletext packet can contain multiple
teletext pages. In order to support that, the teletext decoder may buffer
some pages.

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-27 23:12:41 +01:00
Lukasz Marek
b387a24cb4 lavd/fbdev_enc: remove unused variables 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-27 22:46:32 +01:00
Michael Niedermayer
758b6d39f6 avcodec/hevc: calculate checksum only if AV_EF_EXPLODE is set 
This avoids a slowdown with the default of enabled CRC checks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-27 22:31:04 +01:00
Michael Niedermayer
69d39cb90c Revert "avcodec/options_table: disable CRC checking by default" 
This reverts commit c7027ce9ea.

It appears there is no complete consensus on this currently.
 2013-10-27 22:30:31 +01:00
Michael Niedermayer
e797bd9dc7 Revert "avcodec/options_table: set err_detect to careful by default" 
This reverts commit b1348eb68b.
 2013-10-27 22:30:00 +01:00
Lukasz Marek
b04af34600 lavd/fbdev_enc: more stream validation restrictive 
So far fbdev_enc device picked up first video stream and ignored others.
It is required to provide exactly one video stream now.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2013-10-27 21:45:32 +01:00
Lukasz Marek
7f5e75eea9 lavd/pulse_audio_enc: more stream validation restrictive 
So far pulse device picked up first audio stream and ignored others.
It is required to provide exactly one audio stream now.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2013-10-27 21:45:32 +01:00
Lukasz Marek
4fb3aa491b lavd:pulse_audio_enc: fix array compared against 0 
fixes CID 1113222

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2013-10-27 21:45:26 +01:00
Lukasz Marek
e5b3b75669 lavd/pulse_audio_enc: fix timestamp calculation 
Current implementation didn't include duration of
last processed packet.
Also remove access to st->cur_dts and replace with pkt->pts.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2013-10-27 21:43:05 +01:00
Anton Khirnov
0b357a8095 AVOptions: do not range check flag options. 
It does not make sense in the vast majority of use cases, no currently
defined AV_OPT_TYPE_FLAGS options in Libav set the range to anything
nontrivial, and many of those get it wrong (the "correct" range is
INT_MIN to INT_MAX so that the builtin constant "all" works).
 2013-10-27 21:40:33 +01:00
Anton Khirnov
94603feb1b h264_ps: when parsing a VUI fails, only abort when explode is set 
A VUI doesn't contain anything strictly necessary for decoding.
Apparently there are many samples with truncated VUIs in the wild, this
commit should allow decoding them.
 2013-10-27 21:39:01 +01:00
Paul B Mahol
79ef4b19bf FATE: add bitexact sws flags to the fieldorder test 
swscale is called for the 420 to 422 conversion

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-10-27 21:34:28 +01:00
Anton Khirnov
ddc589ce98 avconv: drop a now useless variable 2013-10-27 21:32:37 +01:00
Vittorio Giovara
529a9893d7 avframe: mark source frame const in _ref and _clone 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-10-27 21:32:37 +01:00
Vittorio Giovara
fc06ee6ee3 mmvideo: fix uninitialized variable use in mm_decode_intra 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-10-27 21:32:11 +01:00
Paul B Mahol
75b2bbe21d libavfilter/vf_noise: relicense to LGPL 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-27 20:29:07 +00:00
Michael Niedermayer
b1348eb68b avcodec/options_table: set err_detect to careful by default 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-27 21:18:50 +01:00
Anton Khirnov
c7027ce9ea avcodec/options_table: disable CRC checking by default 
3 runs each of fate-suite/hevc-conformance/ENTP_C_LG_3.bit

with crc flag
1841819858 decicycles in frame decode, 32 runs, 0 skips
1833937180 decicycles in frame decode, 32 runs, 0 skips
1843283884 decicycles in frame decode, 32 runs, 0 skips

without crc flag
1703897301 decicycles in frame decode, 32 runs, 0 skips
1695031879 decicycles in frame decode, 32 runs, 0 skips
1697524383 decicycles in frame decode, 32 runs, 0 skips

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-27 21:18:50 +01:00
Michael Niedermayer
2886d6cbb7 avcodec/takdec: also do crc check when er compliant is set 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-27 21:18:40 +01:00
Derek Buitenhuis
d206fd996b avio: Check for memory allocation failure of private data 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-10-27 19:15:03 +00:00
Derek Buitenhuis
52aed19307 avfiltergraph: Properly handle memory allocation failure 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-10-27 19:15:03 +00:00
Derek Buitenhuis
6ef30976e0 timefilter: Handle memory allocation failure 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-10-27 19:14:23 +00:00
Justin Ruggles
211ca69b13 lavr: check that current_buffer is not NULL before using it 
Fixes a segfault during resampling when compiled with -DDEBUG.
Fixes all fate-lavr-resample tests with -DDEBUG.

CC:libav-stable@libav.org
 2013-10-27 15:07:10 -04:00