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

48627 Commits

Author SHA1 Message Date
Michael Niedermayer 249fca3df9 Merge commit '074a00d192c0e749d677b008b337da42597e780f' 
* commit '074a00d192c0e749d677b008b337da42597e780f':
  lavr: add a public function for setting a custom channel map
  lavr: typedef internal structs in internal.h
  doc: Extend commit message section

Conflicts:
	doc/APIchanges
	doc/developer.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-08 12:56:41 +01:00
Michael Niedermayer 3a0bac27b3 Merge commit 'ac2603be28602bea76cf38bdbf37aead0dc2979a' 
* commit 'ac2603be28602bea76cf38bdbf37aead0dc2979a':
  doc: Mention memory allocation in the fuzz testing section

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-08 12:49:02 +01:00
Michael Niedermayer 32cf37d097 Merge commit 'dc3e12d1cb65d74fb120197ce869a205718b6715' 
* commit 'dc3e12d1cb65d74fb120197ce869a205718b6715':
  doc: Mention zzuf in the fuzz testing section

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-08 12:46:59 +01:00
Michael Niedermayer adc7296aa5 Merge commit 'b5f9b9ac3681acb06d95530f34660ba9fe225305' 
* commit 'b5f9b9ac3681acb06d95530f34660ba9fe225305':
  doc: Merge disjointed bits about emailing patches

Conflicts:
	doc/developer.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-08 12:45:24 +01:00
Michael Niedermayer 3bca69c2a8 Merge commit '9a00374cb4512a58a1fee366b850dfa87c76e1f3' 
* commit '9a00374cb4512a58a1fee366b850dfa87c76e1f3':
  doc: Fix a few typos in the developer documentation
  xwma: Remove unused variable
  asfdec: Fix printf format string length modifier

Conflicts:
	doc/developer.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-08 12:34:14 +01:00
Justin Ruggles 074a00d192 lavr: add a public function for setting a custom channel map 
This allows reordering, duplication, and silencing of input channels.
 2013-01-07 21:49:06 -05:00
Justin Ruggles 4d68269d58 lavr: typedef internal structs in internal.h 
Simplifies header dependencies by not including all other internal headers
in internal.h.
 2013-01-07 21:49:05 -05:00
Michael Niedermayer 1a088f61e1 oggparseskeleton: Check the overall start time before using it. 
Fixes division by zero

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-08 02:58:01 +01:00
Michael Niedermayer 4c80184cf5 mjpegdec: allow 2 components in ljpeg_decode_yuv_scan() 
Fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-08 02:54:21 +01:00
Carl Eugen Hoyos b23aff6755 Add forgotten AVC Intra entry to Changelog. 2013-01-08 01:08:36 +01:00
Michael Niedermayer 953061ed95 lavf/utils: more complete dts checks 
Fixes division by zero

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-08 00:28:35 +01:00
Michael Niedermayer 3b57bb478f svq1dec: check that the reference frame matches in size before using it. 
Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-08 00:28:35 +01:00
Clément Bœsch dbf0a90572 lavc: fix forgotten "que" reference. 
This should have been part of 491ca0e8.
 2013-01-07 22:07:50 +01:00
Michael Niedermayer 0780fe2740 rmdec: Limit videobufsize to remaining amount of data 
Fixes excessive memory allocation

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 21:35:52 +01:00
Michael Niedermayer f65daf577a rv10: always check direct mode interpolation times. 
Fixes Division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 21:35:52 +01:00
Derek Buitenhuis ac2603be28 doc: Mention memory allocation in the fuzz testing section 
It's obviously undesireable to blindly allocate memory based on
a damaged 'size' value, for example.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-01-07 14:55:49 -05:00
Derek Buitenhuis dc3e12d1cb doc: Mention zzuf in the fuzz testing section 
It's pretty much the best tool for the job, and it's what we
all use now anyway.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-01-07 14:55:49 -05:00
Derek Buitenhuis 6042a12174 doc: Extend commit message section 
If a bug exists on the tracker, its ID should always be included
in fix messages.

Also, any relevant bug fixes should be CC'd to libav-stable, so
we can actually track what needs to be backported, instead of
just randomly combing the git history and old CVEs.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-01-07 14:55:49 -05:00
Derek Buitenhuis b5f9b9ac36 doc: Merge disjointed bits about emailing patches 
We obviously prefer git-send-email(1), and the disjointed nature
of the two statements was misleading.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-01-07 14:55:48 -05:00
Derek Buitenhuis 9a00374cb4 doc: Fix a few typos in the developer documentation 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-01-07 14:55:48 -05:00
Peter Ross a572cc8c7a wtvdec: prevent memory leak in get_tag() 2013-01-08 01:59:13 +11:00
Michael Niedermayer 7fb87bc5f2 mpeg12enc: check dimension validity 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 15:47:21 +01:00
Michael Niedermayer bcc4ef1a41 mpeg12enc: Correctly mask dimensions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 15:47:06 +01:00
Michael Niedermayer 878e5bd6f5 mpeg12: Support decoding dimensions that are a multiple of 4096 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 15:31:00 +01:00
Michael Niedermayer 7a6beedd3f oggparsevorbis: fix vorbis_cleanup return type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 14:20:28 +01:00
Michael Niedermayer 1700be5855 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  oggdec: make sure the private parse data is cleaned up

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 14:20:21 +01:00
Michael Niedermayer 2db8660f09 Merge commit '89b51b570daa80e6e3790fcd449fe61fc5574e07' 
* commit '89b51b570daa80e6e3790fcd449fe61fc5574e07':
  oggdec: free the ogg streams on read_header failure

Conflicts:
	libavformat/oggdec.c

Original commit this was based on: (this merge just moves the function up)
commit 07a866282f
Author: Michael Niedermayer <michaelni@gmx.at>
Date:   Tue Nov 20 15:12:37 2012 +0100

    oggdec: fix memleak on header parsing failure

    Fixes Ticket1931

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 14:03:48 +01:00
Benjamin Larsson bbae68596e xwma: Remove unused variable 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-01-07 13:25:20 +01:00
Peter Ross 8b4842c2e2 wtvdec: warn about truncated files 2013-01-07 23:14:58 +11:00
Peter Ross 801b636633 wtvenc: mux thumbnail picture 2013-01-07 23:14:58 +11:00
Peter Ross 361ecb6176 wtvdec: ignore WM/MediaThumbType metadata entry 
This tag is used by Windows Media Centre in displaying the thumbnail,
and should be transformed into FFmpeg metadata string.
 2013-01-07 23:14:58 +11:00
Peter Ross 508836932f wtvdec: demux thumbnail picture to AVStream.attached_pic 2013-01-07 23:14:58 +11:00
Paul B Mahol 2a89081cad Add EVRCA and SMV codec id 
Demuxing files should be possible even if there are
no decoding support in lavc (yet).

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-07 11:43:20 +00:00
Peter Ross 6cff56f0ba frmdec: tag 2 is AV_PIX_FMT_RGB0 2013-01-07 22:06:06 +11:00
Peter Ross 8d4c817c4a frmdec: terminate frm_pix_fmt_tags 2013-01-07 22:06:06 +11:00
Peter Ross f2dc158b0a frmdec: use AV_PIX_FMT_xxx 2013-01-07 22:06:06 +11:00
Paul B Mahol 2516023695 012v: remove double ; and return correct error code if ff_get_buffer() fails 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-07 10:48:02 +00:00
Paul B Mahol 7f7f31bfcb iff: support seeking with maud 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-07 10:19:49 +00:00
Paul B Mahol 3174137d41 w64: fact guid support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-07 10:08:38 +00:00
Paul B Mahol e13c5abbd7 Changelog: move Megalux where it belongs 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-07 09:45:45 +00:00
Diego Biurrun e817d9139f asfdec: Fix printf format string length modifier 2013-01-07 09:21:42 +01:00
Michael Niedermayer 92e79e595b Merge remote-tracking branch 'qatar/master' 
Merge only for metadata, no commits merged

* qatar/master:
  Drop Snow codec
  Prepare for 10_alpha1 Release

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 02:01:39 +01:00
Michael Niedermayer c526a01c91 Merge commit '4f50646697606df39317b93c2a427603b77636ee' 
* commit '4f50646697606df39317b93c2a427603b77636ee':
  x86: sbrdsp: Implement SSE qmf_post_shuffle

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 01:51:10 +01:00
Michael Niedermayer 8429320313 Merge commit '44a0036d10579ed91e48df24859e54b08a582742' 
* commit '44a0036d10579ed91e48df24859e54b08a582742':
  x86: sbrdsp: Implement SSE sum64x5

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 01:40:05 +01:00
Michael Niedermayer ea93ccf079 Merge commit '5b4dfbffc258f90a7d2540d21209ac23afcf7cd0' 
* commit '5b4dfbffc258f90a7d2540d21209ac23afcf7cd0':
  x86: ABS1: port to cpuflags
  v210x: cosmetics, reformat

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 01:35:18 +01:00
Michael Niedermayer 55d8cac254 Merge commit '6689474b91049411b5b7986616d1c66b701ae11f' 
* commit '6689474b91049411b5b7986616d1c66b701ae11f':
  v210x: return meaningful error codes.
  r210dec: return meaningful error codes.
  vb: cosmetics, reformat

Conflicts:
	libavcodec/vb.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 01:30:23 +01:00
Michael Niedermayer 501db2f32b Merge commit '9dbbda235d93d628777b986e502213f1ed390973' 
* commit '9dbbda235d93d628777b986e502213f1ed390973':
  vb: return meaningful error codes.
  ptx: return meaningful error codes.
  tiff: return meaningful error codes.
  vqavideo: return meaningful error codes.
  mss2: return meaningful error codes.
  v210dec: return meaningful error codes
  indeo2: cosmetics, reformat

Conflicts:
	libavcodec/indeo2.c
	libavcodec/tiff.c
	libavcodec/v210dec.c
	libavcodec/vb.c
	libavcodec/vqavideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 01:24:32 +01:00
Michael Niedermayer 4b20d307b3 Merge commit '7b1fbd4729a52dd7c02622dbe7bb81a6a7ed12f8' 
* commit '7b1fbd4729a52dd7c02622dbe7bb81a6a7ed12f8':
  indeo2: check decoding errors.
  indeo2: return meaningful error codes
  rl2: cosmetics, reformat

Conflicts:
	libavcodec/rl2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 01:11:14 +01:00
Michael Niedermayer d30660306c Merge commit '3c6e5a840c45fd3b832e86881602a72e47d46f19' 
* commit '3c6e5a840c45fd3b832e86881602a72e47d46f19':
  rl2: use fixed-width integer types where appropriate
  rl2: return meaningful error codes.
  cljr: return a meaningful error code.
  fraps: cosmetics, reformat

Conflicts:
	libavcodec/fraps.c
	libavcodec/rl2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 01:01:13 +01:00
Michael Niedermayer 07f22d0b49 Merge commit '57d11e5e28bfe0bc445ad78fc033aafa73068bb4' 
* commit '57d11e5e28bfe0bc445ad78fc033aafa73068bb4':
  fraps: return meaningful error codes.
  kgv1dec: return meaningful error codes.
  kmvc: return meaningful error codes.
  wnv1: return meaningful error codes.
  dpx: return meaningful error codes.
  truemotion1: return meaningful error codes
  pnm: return meaningful error codes.

Conflicts:
	libavcodec/dpx.c
	libavcodec/fraps.c
	libavcodec/kmvc.c
	libavcodec/pnm.c
	libavcodec/pnmdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 00:41:06 +01:00