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
69,966 Commits 37 Branches 400 Tags 460 MiB
29d2197d88
Commit Graph

69966 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
29d2197d88 Merge commit 'b727b0eeb73cd78533a7fd387ceccd505e48fa6c' 
* commit 'b727b0eeb73cd78533a7fd387ceccd505e48fa6c':
  fate: Add tests for DSS

Conflicts:
	tests/fate/audio.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-19 21:53:39 +01:00
Michael Niedermayer
e821910a21 Merge commit '062cd5a975ff7bd6fb91f9b4d1d9d102a7545499' 
* commit '062cd5a975ff7bd6fb91f9b4d1d9d102a7545499':
  lavf: Add DSS demuxer

Conflicts:
	libavformat/Makefile
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-19 21:44:58 +01:00
Michael Niedermayer
dfe5a9f022 Merge commit 'c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b' 
* commit 'c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b':
  lavc: Add DSS SP decoder

Conflicts:
	libavcodec/avcodec.h
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-19 21:31:26 +01:00
Michael Niedermayer
99bcfe6227 Merge commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23' 
* commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23':
  qsv_api: fix building with libmfx disabled

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-19 21:12:33 +01:00
Michael Niedermayer
ac649bb775 Merge commit '11c22dfd495bbd3f38df639772aa4bb9a1be882d' 
* commit '11c22dfd495bbd3f38df639772aa4bb9a1be882d':
  configure: add missing h264_qsv hwaccel deps

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-19 21:12:19 +01:00
Michael Niedermayer
841e9f431c Merge commit '4e08c821106fc1d6d358864abf0d8488b12f38c6' 
* commit '4e08c821106fc1d6d358864abf0d8488b12f38c6':
  lavc: add an Intel libmfx-based H.264 decoder

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-19 21:12:04 +01:00
Michael Niedermayer
560eb7179a Merge commit '31d2039cb42668ebcf08248bc48bbad44aa05f49' 
* commit '31d2039cb42668ebcf08248bc48bbad44aa05f49':
  h264_parser: export video format and dimensions

Conflicts:
	libavcodec/h264_parser.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-19 20:39:04 +01:00
Michael Niedermayer
e3755119fa Merge commit '5b1d9ceec715846a58fe029bc3889ed6fa62436a' 
* commit '5b1d9ceec715846a58fe029bc3889ed6fa62436a':
  pixfmt: add a pixel format for QSV hwaccel

Conflicts:
	doc/APIchanges
	libavutil/pixfmt.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-19 20:23:48 +01:00
Vittorio Giovara
b727b0eeb7 fate: Add tests for DSS 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
 2015-02-19 12:05:19 -05:00
Oleksij Rempel
062cd5a975 lavf: Add DSS demuxer 
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-02-19 12:05:19 -05:00
Oleksij Rempel
c56b9b1eb2 lavc: Add DSS SP decoder 
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-02-19 12:05:19 -05:00
Anton Khirnov
0fbb271318 qsv_api: fix building with libmfx disabled 2015-02-19 17:35:34 +01:00
Anton Khirnov
11c22dfd49 configure: add missing h264_qsv hwaccel deps 2015-02-19 17:32:55 +01:00
Michael Niedermayer
65da611d34 Merge remote-tracking branch 'cigaes/master' 
* cigaes/master:
  doc/faq: explain DAR/SAR preserving.
  doc: set documentencoding on toplevel texi files.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-19 16:37:46 +01:00
Kevin Wheatley
fb3fb1d0d4 avformat/mov: Add simple ACLR atom reading to set the color range of the incomming track for codec's like DNxHD that utilise AVID's proprietary atom. 
On input ACLR will be used to set colour range no matter which codec
it is associated with.
No change for when it will be output.

Rework mov_read_extradata function to allow detection of truncated
atom reads by callers.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-19 15:42:55 +01:00
Anton Khirnov
4e08c82110 lavc: add an Intel libmfx-based H.264 decoder 
Based on the code by Luca Barbato <lu_zero@gentoo.org> and Yukinori
Yamazoe <drocon11@gmail.com>.
 2015-02-19 15:08:49 +01:00
Anton Khirnov
31d2039cb4 h264_parser: export video format and dimensions 2015-02-19 15:07:52 +01:00
Anton Khirnov
5b1d9ceec7 pixfmt: add a pixel format for QSV hwaccel 2015-02-19 15:07:21 +01:00
Nicolas George
c49c42a4a3 doc/faq: explain DAR/SAR preserving. 2015-02-19 11:30:30 +01:00
Nicolas George
b491751409 doc: set documentencoding on toplevel texi files. 
Fix double UTF-8 encoding on output files.
makeinfo / texi2any does not seem to provide a way of setting
it globally for toplevel files.
 2015-02-19 11:30:30 +01:00
Clément Bœsch
2280552057 avfilter/palettegen: raise cache size from 64k to 512k 
(or 32k to 256k in 32-bit)

This is similar to a00bab3475
 2015-02-19 11:17:45 +01:00
Michael Niedermayer
c1ff2cdbca Merge commit '0f532fd3f9b9ca974cea0feb8ddcaf4a7f3b23c5' 
* commit '0f532fd3f9b9ca974cea0feb8ddcaf4a7f3b23c5':
  rv40: Return more meaningful error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-19 10:54:07 +01:00
Himangi Saraogi
0f532fd3f9 rv40: Return more meaningful error codes 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2015-02-19 08:39:29 +01:00
Michael Niedermayer
f144e4ddff avcodec/wmalosslessdec: use sizeof() instead of a literal number 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-19 03:14:50 +01:00
Michael Niedermayer
9d88be6873 avfilter/vf_subtitles: Add () to protect the argument of the AA() macro 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-19 01:51:54 +01:00
Michael Niedermayer
e0be5c4fbe avutil/sha: Protect macro arguments with () 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-18 22:50:41 +01:00
Michael Niedermayer
80d278a981 ffmpeg_opt: Add missing MATCH_PER_TYPE_OPT() for data codecs 
Fixes: CID1270809

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-18 22:13:35 +01:00
Michael Niedermayer
77c133f7ac Merge commit 'd617e77cecc5b363ef1860955b548f4ac007add6' 
* commit 'd617e77cecc5b363ef1860955b548f4ac007add6':
  libx265: Add crf private option

See: 8b96e8dd28
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-18 20:45:18 +01:00
Michael Niedermayer
00acf38379 Merge commit '2de887e45b664f44b51686f5979fa8ce6dfe2ec2' 
* commit '2de887e45b664f44b51686f5979fa8ce6dfe2ec2':
  libx265: Reduce the scope of some variables

See: b920db6731
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-18 20:26:29 +01:00
Supraja Meedinti
4b7c26843c tests: fate: adding fate-test for twofish 
Signed-off-by: Supraja Meedinti <supraja0493@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-18 17:57:43 +01:00
Michael Niedermayer
9e008ed1b4 avformat/movenc: Fix use of uninitialized variable (ret) 
Fixed CID1270823

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-18 16:33:15 +01:00
Derek Buitenhuis
8b96e8dd28 libx265: Add crf private option 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2015-02-18 10:21:56 -05:00
Derek Buitenhuis
b920db6731 libx265: Reduce the scope of some variables 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2015-02-18 10:21:54 -05:00
Derek Buitenhuis
d617e77cec libx265: Add crf private option 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2015-02-18 10:18:12 -05:00
Derek Buitenhuis
2de887e45b libx265: Reduce the scope of some variables 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2015-02-18 10:16:50 -05:00
Michael Niedermayer
b68d902b6e avformat/ffmenc: Use av_freep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-18 14:31:11 +01:00
Michael Niedermayer
c8c10a5fc7 avformat/ffmenc: Fix memleak of buf 
Fixes CID1257015

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-18 14:30:15 +01:00
Clément Bœsch
8087632027 avfilter/showpalette: fix leak in case of error 
Fixes CID1270820
Fixes CID1270818
 2015-02-18 14:04:10 +01:00
Clément Bœsch
80f44eafaa avfilter/palettegen: fix leak in case of error 2015-02-18 14:04:10 +01:00
Clément Bœsch
f40266560b avfilter/paletteuse: fix leak in case of error 
Fixes CID1270819
 2015-02-18 14:04:10 +01:00
Michael Niedermayer
9f6431c8f6 avfilter/af_channelmap: Move potential dereference after NULL check in get_channel_idx() 
Fixes CID1270822

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-18 13:40:39 +01:00
Michael Niedermayer
bdb3194217 avfilter/vf_qp: Fix leak of out_qp_table_buf 
Fixes CID1270821

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-18 13:12:06 +01:00
Michael Niedermayer
a76e91bf67 avfilter/avfiltergraph: assert that the heap_bubble index is valid 
This might help coverity

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-18 12:31:02 +01:00
Michael Niedermayer
424ed1a83e avcodec/faxcompr: Fix memleak 
Fixes CID1270816

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-18 11:38:00 +01:00
Paul B Mahol
956bd71eeb avcodec/opusdec: remove unused headers 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-02-18 09:58:16 +00:00
Michael Niedermayer
8bc80016c1 avfilter/vf_removelogo: Add () to protect the argument of apply_mask_fudge_factor() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-18 01:56:19 +01:00
Michael Niedermayer
d501b986a9 swscale/bayer_template: Add () to protect the argument of BAYER_READ() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-18 01:55:15 +01:00
Michael Niedermayer
0babb896b4 compat/avisynth/windowsPorts/windows2linux: Add () to protect macro arguments 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-18 01:49:35 +01:00
Michael Niedermayer
b7c19aee6c avcodec/wavpack: Add () to protect the arguments of UPDATE_WEIGHT_CLIP() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-18 01:49:35 +01:00
Michael Niedermayer
dfc2a3982f avcodec/wmalosslessdec: Add () to protect the arguments of WMASIGN() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-18 01:49:28 +01:00