virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
57,613 Commits 37 Branches 400 Tags 465 MiB
70737b83f0
Commit Graph

57613 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Stefano Sabatini
d4ac3e5934 lavc/mpegvideo_enc: fix typo 2013-10-29 18:36:21 +01:00
Stefano Sabatini
9fa0dccca6 lavc: extend documentation for the "bf" option 2013-10-29 18:30:27 +01:00
Stefano Sabatini
61c1f2cb1e doc/muxers: add definitory line for the MOV/MP4/ISMV muxer 
Also rename section name, to match the other ones adopting the muxer name
(rather than the related upcased standard name).
 2013-10-29 18:30:27 +01:00
Michael Niedermayer
ce55e667fa avcodec/mpegvideo_enc: check that max_b_frames is not negative 
Fixes crash found by saste
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-29 16:13:07 +01:00
Michael Niedermayer
6103faaa51 matroskaenc: fixed display width / height calculation for stereo mode 
Based-on: patch by Asan Usipov <asan.usipov@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-29 16:08:00 +01:00
Ingo Brückl
8fbb0979da build: remove pointless condition 
$(STRIP) always expands to something, because it is one of the commands
in the BRIEF list. This renders the condition pointless.

Signed-off-by: Ingo Brückl <ib@wupperonline.de>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-10-29 14:00:29 +00:00
Derek Buitenhuis
58d13cea30 h264: Check all allocations 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-10-29 14:00:29 +00:00
Diego Biurrun
9510d7689e fate.sh: Allow non-fast-forwards when updating sources 2013-10-29 14:46:28 +01:00
Anton Khirnov
c872d310cd avconv: stop accessing AVStream.parser 
It is private and must not be touched from outside of lavf.
 2013-10-29 14:19:10 +01:00
Anton Khirnov
8b64c2ba03 lavc: add a dummy field to AVStream to preserve ABI compatibility for avconv 
avconv abuses the API by accessing AVStream.parser (which is private).
Removing AVStream.reference_dts in
2ba68dd044 breaks ABI compatibility for an
old avconv using a newer lavf. Fix this by adding a dummy field until
the next bump.
 2013-10-29 14:19:10 +01:00
Derek Buitenhuis
a483aae7d8 h264: Check all allocations 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-10-29 12:00:27 +00:00
Derek Buitenhuis
25c7db7cc9 avio: Check for memory allocation failure of private data 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-10-29 11:40:15 +00:00
Derek Buitenhuis
327c439f81 timefilter: Handle memory allocation failure 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-10-29 11:40:04 +00:00
Derek Buitenhuis
069ceea7da timefilter: Fix typo in allocation failure message 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-10-29 11:38:35 +00:00
Michael Niedermayer
325f6e0a97 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavfi: do not export the filters from shared objects

Conflicts:
	libavfilter/af_amix.c
	libavfilter/af_anull.c
	libavfilter/asrc_anullsrc.c
	libavfilter/f_select.c
	libavfilter/f_settb.c
	libavfilter/split.c
	libavfilter/src_movie.c
	libavfilter/vf_aspect.c
	libavfilter/vf_blackframe.c
	libavfilter/vf_colorbalance.c
	libavfilter/vf_copy.c
	libavfilter/vf_crop.c
	libavfilter/vf_cropdetect.c
	libavfilter/vf_drawbox.c
	libavfilter/vf_format.c
	libavfilter/vf_framestep.c
	libavfilter/vf_frei0r.c
	libavfilter/vf_hflip.c
	libavfilter/vf_libopencv.c
	libavfilter/vf_lut.c
	libavfilter/vf_null.c
	libavfilter/vf_overlay.c
	libavfilter/vf_scale.c
	libavfilter/vf_transpose.c
	libavfilter/vf_unsharp.c
	libavfilter/vf_vflip.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-29 11:58:11 +01:00
Luca Barbato
e789130522 configure: Provide an hardened toolchain option 2013-10-29 11:36:00 +01:00
Luca Barbato
dcd3eda6cb configure: Move gcc-only -W option where it belongs 2013-10-29 11:36:00 +01:00
Michael Niedermayer
d3e13250a0 Merge commit 'feeafb4adabd5c17de1738ed9962e40892b20edb' 
* commit 'feeafb4adabd5c17de1738ed9962e40892b20edb':
  lavf: do not export av_register_{rtp,rdt}_dynamic_payload_handlers from shared objects

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-29 11:06:32 +01:00
Michael Niedermayer
e36231969a avcodec/audioconvert: deprecate API 
Note, the header was not installed so useage of this should be limited
but its not 0, there are some random pieces of code using it according
to google.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-29 10:48:57 +01:00
Paul B Mahol
66518f6feb avcodec/cook: use av_freep() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-29 09:37:59 +00:00
Michael Niedermayer
6bf4edec27 Merge commit 'c9a13a289d0e1607387854127476813a1ee3d34b' 
* commit 'c9a13a289d0e1607387854127476813a1ee3d34b':
  lavc: remove old unused audio conversion functions.

Conflicts:
	libavcodec/audioconvert.c
	libavcodec/audioconvert.h

Merge only for metadata.
keeping the old API longer reduces the need for applications to be continuously
updated.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-29 10:21:23 +01:00
Michael Niedermayer
f1f0b01c47 avformat/gxf: fix old codec id 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 23:54:42 +01:00
Michael Niedermayer
e510171f31 avcodec: fix old codec ids 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 23:54:28 +01:00
Michael Niedermayer
f0b26bf0f5 avcodec/dvdec: dont try to decode ac when theres no input 
fixes reading out of an empty bitstream

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 23:09:35 +01:00
Stephen Hutchinson
f87a2e1272 avisynth: Factor out a couple of returns 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 22:30:43 +01:00
Stephen Hutchinson
ac9529ceec avisynth: Simplify a stray av_log message 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 22:30:36 +01:00
Stephen Hutchinson
7ac67583c3 avisynth: Switch a couple of AVERROR_UNKNOWNs to AVERROR(ENOMEM) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 22:30:20 +01:00
Stephen Hutchinson
c7f9aab801 avisynth: Use AV_* prefixes for video and audio IDs 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 22:26:56 +01:00