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
69,395 Commits 37 Branches 400 Tags 460 MiB
c2ad22ff99
Commit Graph

69395 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
c2ad22ff99 Merge commit '08fa34bf75942f66796d770ff42a3721b2e3d2d4' 
* commit '08fa34bf75942f66796d770ff42a3721b2e3d2d4':
  yuv4mpegdec: initialize field_order in yuv4_read_header()

Conflicts:
	libavformat/yuv4mpegdec.c

See: 52a17972de
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-29 21:55:02 +01:00
Michael Niedermayer
e18e5ae62c Merge commit '302ca6b20ed01ac584f5b15d5bca3d3a92b7a77a' 
* commit '302ca6b20ed01ac584f5b15d5bca3d3a92b7a77a':
  mpegvideo_enc: initialize the encoding context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-29 21:36:20 +01:00
Michael Niedermayer
56252a5e09 Merge commit '1a07df31128da3a0020b66502399989b91770d44' 
* commit '1a07df31128da3a0020b66502399989b91770d44':
  DNxHD: Add support for id 1258 (DNx100 960x720@8)

Conflicts:
	Changelog
	libavcodec/dnxhddata.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-29 21:21:49 +01:00
Michael Niedermayer
64e7cf1253 Merge commit '598f7d046cbf306706623210c5baafa3b7cd1df3' 
* commit '598f7d046cbf306706623210c5baafa3b7cd1df3':
  DNxHD: Simplify pixel format detection

Conflicts:
	libavcodec/dnxhddec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-29 20:54:25 +01:00
Michael Niedermayer
e5b7e2224f Merge commit '41e03e284ee7b0d4caa3a5d28681ad46e3105d65' 
* commit '41e03e284ee7b0d4caa3a5d28681ad46e3105d65':
  DNxHD: More verbose error messages

Conflicts:
	libavcodec/dnxhddec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-29 20:38:35 +01:00
Michael Niedermayer
bcadf5d940 Merge commit '1279221cc4d63bc4449df86ae7a98e633f8be425' 
* commit '1279221cc4d63bc4449df86ae7a98e633f8be425':
  lavu: Check av_dict_set allocations

Conflicts:
	libavutil/dict.c

See: a963fdb0ea
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-29 20:28:24 +01:00
Vittorio Giovara
08fa34bf75 yuv4mpegdec: initialize field_order in yuv4_read_header() 
CC: libav-stable@libav.org
Bug-Id: CID 1265721
 2015-01-29 15:26:33 +00:00
Vittorio Giovara
302ca6b20e mpegvideo_enc: initialize the encoding context 
This prevents several uninitialized variable uses that take
place towards the end of encoding.

CC: libav-stable@libav.org
Bug-Id: CID 700760
 2015-01-29 15:26:33 +00:00
Vittorio Giovara
1a07df3112 DNxHD: Add support for id 1258 (DNx100 960x720@8) 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-01-29 15:04:57 +00:00
Vittorio Giovara
598f7d046c DNxHD: Simplify pixel format detection 
Error out in case of unknown values.
 2015-01-29 15:04:46 +00:00
Vittorio Giovara
41e03e284e DNxHD: More verbose error messages 2015-01-29 15:04:35 +00:00
Luca Barbato
1279221cc4 lavu: Check av_dict_set allocations 
Bug-Id: CID 1257772
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-01-29 14:59:57 +00:00
Zhang Rui
038f3a173f avformat/concatdec: avoid NULL dereference when failed to open file. 
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-29 14:25:04 +01:00
Michael Niedermayer
d39fa69dfc Merge commit '6996fd204a7f28b46a8c3c97bcf223998218c743' 
* commit '6996fd204a7f28b46a8c3c97bcf223998218c743':
  libopenh264: Log debug messages to a non-null context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-29 14:13:25 +01:00
Stefano Sabatini
d43c1ec684 examples/filtering: extend comments about setting the filter graph endpoints 
That part is a constant source of confusions for readers, this should
help clarify the apparently inverted logic.
 2015-01-29 11:12:39 +01:00
Stefano Sabatini
af7b89e08b lavfi: document assumptions about the input and output labels of a filter graph description 2015-01-29 10:12:34 +01:00
Stefano Sabatini
d11fcf735f doc/filters: apply some updates to the Filtergraph syntax section 2015-01-29 10:12:34 +01:00
Martin Storsjö
6996fd204a libopenh264: Log debug messages to a non-null context 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-01-29 09:16:35 +02:00
Arwa Arif
a21acd554a Fix frame-alignment in PP7 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-29 04:38:48 +01:00
Michael Niedermayer
4155f2d7cc Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Add an ARES atom to extradata when encoding avui.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-29 03:02:09 +01:00
Supraja Meedinti
6ad749b533 libavutil: Added twofish symmetric block cipher 
Signed-off-by: Supraja Meedinti <supraja0493@gmail.com>
Reviewed-by: Giorgio Vazzana <mywing81@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-29 01:56:11 +01:00
Carl Eugen Hoyos
3ea97767e4 Add an ARES atom to extradata when encoding avui. 
Allows playback with QuickTime and the original codec.

Tested by Olaf Matthes, olaf matthes gmx de
 2015-01-29 01:07:08 +01:00
Michael Niedermayer
72db3c79df Merge commit '61928b68dc28e080b8c8191afe5541123c682bbd' 
* commit '61928b68dc28e080b8c8191afe5541123c682bbd':
  h264: Do not share rbsp_buffer across threads

Conflicts:
	libavcodec/h264.c

See: ecbf838c7d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-28 22:44:09 +01:00
Michael Niedermayer
58ed152857 avformat/aviobuf: Allow seeking to the end of the buffer for read only buffers 
This undoes the effect of 3c18a7b188 for reading

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-28 20:56:50 +01:00
Michael Niedermayer
0b4fc4bacd Merge commit '3c18a7b18807de81566381a1bcbe9f6103c0296b' 
* commit '3c18a7b18807de81566381a1bcbe9f6103c0296b':
  avio: Do not consider the end-of-buffer position valid

Conflicts:
	libavformat/aviobuf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-28 20:37:28 +01:00
Michael Niedermayer
37984ca133 Merge commit '6a808f5ae17f1fcdbcfb18055872c12aef70ffff' 
* commit '6a808f5ae17f1fcdbcfb18055872c12aef70ffff':
  libdc1394: Add support for MONO8 (gray) video mode

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-28 20:29:29 +01:00
Paul B Mahol
c099783316 avformat/nsvdec: remove case which is no longer possible 
Check of channels !=0 is right above.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-28 17:57:48 +00:00
Michael Niedermayer
a6f9a5d0f6 avfilter/x86/vf_fspp: Fix loop condition for column_fidct() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-28 17:23:27 +01:00
Michael Niedermayer
375a0273ce avfilter/vf_fspp: check count before calling row_idct() 
Fixes crash with odd widths

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-28 17:23:27 +01:00
Arwa Arif
622936424c avfilter/vf_fspp: Fix frame-alignment in FSPP 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-28 17:22:54 +01:00
Michael Niedermayer
61928b68dc h264: Do not share rbsp_buffer across threads 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

CC: libav-stable@libav.org
 2015-01-28 16:28:58 +01:00
Luca Barbato
3c18a7b188 avio: Do not consider the end-of-buffer position valid 
Trigger a refill if the seek action moves the pointer
at the end of the buffer.

Before this patch the read action following the seek would trigger
the refill, while write action would write outside the buffer.

In the Libav codebase few muxers seek forward outside of what
already has been written so it is quite unlikely to experience
the problem with the default buffer size.

CC: libav-stable@libav.org
 2015-01-28 16:28:10 +01:00
Clay McClure
6a808f5ae1 libdc1394: Add support for MONO8 (gray) video mode 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-01-28 16:10:24 +01:00
Paul B Mahol
fca50464dc avfilter/vf_colorchannelmixer: use the name 's' for the pointer to the private context 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-28 14:39:15 +00:00
Paul B Mahol
67aaa7056d avfilter/avf_avectorscope: use the name 's' for the pointer to the private context 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-28 14:34:11 +00:00
Paul B Mahol
6121968a9e avfilter/af_biquads: use the name 's' for the pointer to the private context 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-28 14:30:27 +00:00
Paul B Mahol
f27cda48ec avfilter/vf_extractplanes: use the name 's' for the pointer to the private context 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-28 14:26:13 +00:00
Paul B Mahol
abcf8610b8 avfitler/vf_il: use the name 's' for the pointer to the private context 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-28 14:22:26 +00:00
Paul B Mahol
231bf4d1c2 avfilter/vf_colorbalance: use the name 's' for the pointer to the private context 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-28 14:11:30 +00:00
Paul B Mahol
87577f5508 avfilter/vf_telecine: use the name 's' for the pointer to the private context 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-28 13:51:18 +00:00
Michael Niedermayer
0d37ca150c avutil/aes: Rename crypt() 
This avoids a potential conflict with the equally named function from XOPEN
It also could reduce confusion in debugger backtraces

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-28 13:12:02 +01:00
Michael Niedermayer
ccaa5dcb31 avcodec/h264_parser: Rename close() 
This avoids a potential conflict with the equally named function for closing files
It also could reduce confusion in debugger backtraces

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-28 13:11:03 +01:00
Maneesh Gupta
1600f85cbc doc/fftools-common-opts: update/extend documentation for -opencl_bench option 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2015-01-28 10:00:30 +01:00
Timo Rothenpieler
fb34c580bb avcodec/nvenc: Handle non-square pixel aspect ratios 
Reviewed-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-28 06:10:40 +01:00
Mark Reid
a181169868 tests/fate: added mxf tests for essencegroups and missing index 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-28 05:45:32 +01:00
Carl Eugen Hoyos
449b8cf04b avformat/mxfdec: Fix cleanup in mxf_free_metadataset() 
Fixes Ticket4256

Found-by: tholin
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-28 05:26:01 +01:00
Michael Niedermayer
840570d27b avfilter/vf_mcdeint: avoid uninitilaized fields in AVPacket 
This is also simpler

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-28 00:58:03 +01:00
Reimar Döffinger
6efd0ba977 swresample_internal.h: Move struct declaration before first use. 
It seems more logical and works with more restricted C compilers
like tinycc.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2015-01-27 21:29:51 +01:00
Reimar Döffinger
d96090e7b6 Support BMP files that do not properly align lines. 
Quite a few programs missed that detail of the spec
(including old versions of FFmpeg I believe) and when
we would otherwise fail anyway it seems worth a try
to use a simple byte-aligned stride instead.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2015-01-27 21:29:42 +01:00
Michael Niedermayer
d3d4d98764 Merge commit '8805589b803fab5f362008306319336ac79a3fa7' 
* commit '8805589b803fab5f362008306319336ac79a3fa7':
  libopencv: Rework error handling in parse_iplconvkernel()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-27 20:31:51 +01:00