virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Code Issues Releases Activity
57,641 Commits 37 Branches 400 Tags 462 MiB
9c284a8e19
Commit Graph

57641 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
9c284a8e19 avcodec/flvdec: Use skip_1stop_8data_bits() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 18:28:00 +01:00
Michael Niedermayer
34087b0564 avcodec/dxva2_mpeg2: Use skip_1stop_8data_bits() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 18:28:00 +01:00
Michael Niedermayer
44e8e82d34 avcodec/get_bits: add skip_1stop_8data_bits 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 18:22:03 +01:00
Michael Niedermayer
7f019129e1 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavf: Remove a now useless parameter to ffurl_register_protocol

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 17:48:47 +01:00
Michael Niedermayer
94a80e36d3 avcodec/intelh263dec: make while get_bits loop more robust by checking bits left 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 15:01:00 +01:00
Michael Niedermayer
810f9c5eaa avcodec/ituh263dec: make while get_bits loop more robust by checking bits left 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 15:00:38 +01:00
Michael Niedermayer
489c575bd6 avcodec/ivi_common: make while get_bits loop more robust by checking bits left 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 14:59:00 +01:00
Michael Niedermayer
4b12930f79 avcodec/flacdec: use get_unary() simplify code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 14:58:04 +01:00
Michael Niedermayer
719dbe86ea avcodec/h261dec: make while get_bits loop more robust by checking bits left 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 14:45:39 +01:00
Michael Niedermayer
b0f8b5c819 avcodec/flvdec: make while get_bits loop more robust by checking bits left 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 14:39:31 +01:00
Michael Niedermayer
9f5b75f241 avcodec/flacdec: make while get_bits loop more robust by checking bits left 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 14:39:31 +01:00
Clément Bœsch
0c6bb53bb2 doc/examples/demuxing: reset got_frame. 
Fix infinite loop at flushing.
 2013-10-30 14:37:58 +01:00
Paul B Mahol
65988b9916 avcodec/cook: fix deadlock by using get_unary() 
Fixes #3089.
Reported-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-30 13:26:55 +00:00
Paul B Mahol
387e76f993 avcodec/mdec: use dsp.bswap16_buf() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-30 12:41:43 +00:00
Paul B Mahol
268d0d6e6c avcodec/svq3: use av_fast_padded_malloc() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-30 11:04:07 +00:00
Paul B Mahol
8e609eb475 avcodec/utvideoenc: use av_fast_padded_malloc() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-30 11:04:07 +00:00
Paul B Mahol
82e576046c avcodec/wavpack: use init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-30 11:04:07 +00:00
Paul B Mahol
49c6f0ae15 avcodec/apedec: use init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-30 11:04:06 +00:00
Paul B Mahol
2508fa10c6 avcodec/xan: use init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-30 11:04:06 +00:00
Paul B Mahol
1de8dfcbc4 avcodec/binkaudio: use init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-30 11:04:06 +00:00
Paul B Mahol
2820562935 avcodec/4xm: use av_fast_padded_malloc() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-30 11:04:06 +00:00
Paul B Mahol
c783bec6dc avcodec/mdec: use av_fast_padded_malloc() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-30 11:04:05 +00:00
Paul B Mahol
62ef736f5a avcodec/motionpixels: use av_fast_padded_malloc() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-30 11:04:05 +00:00
Michael Niedermayer
7fd7a10efd Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  oggparsetheora: check av_mallocz result

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 10:41:06 +01:00
Michael Niedermayer
0b9e480b8f Merge commit '5e5fb21877d8da7b3b8a27bb4d6a070d210c152d' 
* commit '5e5fb21877d8da7b3b8a27bb4d6a070d210c152d':
  oggparsetheora: return meaningful error codes

Conflicts:
	libavformat/oggparsetheora.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 10:35:29 +01:00
Michael Niedermayer
70737b83f0 Merge commit 'd4c12b8be4bdd2ffddb3bd5e11773de4c4c46f68' 
* commit 'd4c12b8be4bdd2ffddb3bd5e11773de4c4c46f68':
  oggparsetheora: K&R cosmetics, reformat

Conflicts:
	libavformat/oggparsetheora.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 10:26:00 +01:00
Michael Niedermayer
558784f113 Merge commit 'b9589f5a770ec2357ab7920a5fabe8510b8601f9' 
* commit 'b9589f5a770ec2357ab7920a5fabe8510b8601f9':
  lavc: add error checking to apply_param_change.

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 10:23:24 +01:00
Michael Niedermayer
4427fe7e4b Merge commit '5c0a09839c707f10e5dba59460e219e989c1da93' 
* commit '5c0a09839c707f10e5dba59460e219e989c1da93':
  libopenjpegdec: return meaningful error codes

Conflicts:
	libavcodec/libopenjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 09:33:46 +01:00
Martin Storsjö
0c5f839693 lavf: Remove a now useless parameter to ffurl_register_protocol 
This was added in 9b07a2dc02 as an ABI hack to allow older
code built with lavf 52 to register protocols even if the size
of the URLProtocol struct was increased. Later, registering
protocols from outside of lavf was removed and this workaround
isn't needed any longer since lavf 53.

This removes an unchecked malloc and a memory leak for the cases
when this workaround actually was used - which it hasn't since
lavf 53.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-10-30 09:53:48 +02:00
Anton Khirnov
4f2d8968c0 oggparsetheora: check av_mallocz result 2013-10-30 08:45:31 +01:00
Anton Khirnov
5e5fb21877 oggparsetheora: return meaningful error codes 2013-10-30 08:45:25 +01:00
Anton Khirnov
d4c12b8be4 oggparsetheora: K&R cosmetics, reformat 
Also typedef the private data struct and make its name consistent with
the rest of Libav.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-10-30 08:45:10 +01:00
Anton Khirnov
b9589f5a77 lavc: add error checking to apply_param_change. 2013-10-30 08:43:03 +01:00
Anton Khirnov
5c0a09839c libopenjpegdec: return meaningful error codes 2013-10-30 08:42:41 +01:00
Michael Niedermayer
e1848aa469 avcodec/mpeg12dec: forward errors when EXPLODE is set 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 02:08:34 +01:00
Anssi Hannula
f86387b6c2 lavf/spdifdec: fix demuxing of AAC in IEC 61937 
Return value of avpriv_aac_parse_header() is not checked correctly. Fix
it.

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-29 22:45:27 +01:00
Michael Niedermayer
6b31214379 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  build: remove pointless condition

See: 94d707af3c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-29 22:24:52 +01:00
Michael Niedermayer
845086149b Merge commit '58d13cea307e776664dae711608b358dd4b84fff' 
* commit '58d13cea307e776664dae711608b358dd4b84fff':
  h264: Check all allocations

See: a483aae7d8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-29 22:18:17 +01:00
Michael Niedermayer
7f4fd72f81 tests/fate: fix fate on branches different from origin/master 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-29 21:53:59 +01:00
Michael Niedermayer
0999b1db3c tests/fate.sh: run git reset only when fetch succeded 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-29 21:53:08 +01:00
Michael Niedermayer
a8fe8d4fe9 Merge commit '9510d7689e236f6a4748795604fba427c130d0ad' 
* commit '9510d7689e236f6a4748795604fba427c130d0ad':
  fate.sh: Allow non-fast-forwards when updating sources

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-29 21:50:49 +01:00
Michael Niedermayer
0460b9bb3e Merge commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29' 
* commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29':
  avconv: stop accessing AVStream.parser

Conflicts:
	ffmpeg.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-29 21:38:53 +01:00
Michael Niedermayer
15b1b08874 avutil/opt: fix flags check on non x86 
This should fix several fate failures

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-29 21:07:45 +01:00
Michael Niedermayer
249cc58c3a Merge commit '8b64c2ba0382892cad9e1a5ba601696d4cbb4d04' 
* commit '8b64c2ba0382892cad9e1a5ba601696d4cbb4d04':
  lavc: add a dummy field to AVStream to preserve ABI compatibility for avconv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-29 20:47:23 +01:00
Anton Khirnov
4eb49fdde8 lavf: remove unreliable timestamp guessing heuristic 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-29 20:10:41 +01:00
Michael Niedermayer
e166b82dd4 Merge commit '25c7db7cc99d74fe6fb56a6fd52c9b5f1591e448' 
* commit '25c7db7cc99d74fe6fb56a6fd52c9b5f1591e448':
  avio: Check for memory allocation failure of private data

See: d206fd996b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-29 20:07:27 +01:00
Michael Niedermayer
42bf156e13 Merge commit '327c439f811a89d774db9a86f72951d295193e5f' 
* commit '327c439f811a89d774db9a86f72951d295193e5f':
  timefilter: Handle memory allocation failure

Conflicts:
	libavdevice/jack_audio.c
	libavdevice/timefilter.c

See: 6ef30976e0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-29 20:01:00 +01:00
Michael Niedermayer
6c5f17e738 Merge commit 'e78913052263af80855590659fb0f705e8f13c8a' 
* commit 'e78913052263af80855590659fb0f705e8f13c8a':
  configure: Provide an hardened toolchain option

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-29 19:50:03 +01:00
Michael Niedermayer
df69af4ee1 Merge commit 'dcd3eda6cb8884beeb67ef5eb61b4bb6b01d29ea' 
* commit 'dcd3eda6cb8884beeb67ef5eb61b4bb6b01d29ea':
  configure: Move gcc-only -W option where it belongs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-29 19:43:14 +01:00
Clément Bœsch
8d55362fd0 avformat/avisynth: re-add trailing \n. 
Regression since ac9529ce.

Spotted by Timothy Gu.
 2013-10-29 19:42:08 +01:00