ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-30 10:10:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
69,111 Commits 37 Branches 399 Tags 501 MiB
a0aa3eaafc
Commit Graph

69111 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
a0aa3eaafc Merge commit '89df3fd49e9992441f680326902b4912d79f514f' 
* commit '89df3fd49e9992441f680326902b4912d79f514f':
  swscale: fix warning about incompatible function pointer type

Not merged, this change is incorrect for FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-16 12:51:10 +01:00
Anshul Maheshwari
bb0344dc55 ffmpeg: improve data stream support 
This adds data codec/stream handling where previously there was only
audio/video/subtitles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-16 02:52:04 +01:00
Vittorio Giovara
89df3fd49e swscale: fix warning about incompatible function pointer type 2015-01-16 02:47:10 +01:00
Anshul Maheshwari
a47c9331ef avformat: Improve data streams/codec support 
This adds data codec/stream handling where previously there was only
audio/video/subtitles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-16 02:24:08 +01:00
Michael Niedermayer
ba97cf2c45 avdevice: Use av_format_get_control_message_cb() 
This is required as the location of this field could change and is
specified in libavformat not avdevice

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-16 02:13:01 +01:00
raxon1s
4184d344af ffmpeg: Add bitrate value under -progress action 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-16 00:31:08 +01:00
Michael Niedermayer
2c22042aa0 avcodec/g2meet: Use av_mallocz_array() for framebuffer allocation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 23:04:59 +01:00
Michael Niedermayer
5989a2b24f avcodec/g722enc: Use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 23:02:43 +01:00
Michael Niedermayer
71bd6ea0fa avcodec/flashsv2enc: use av_realloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 23:00:52 +01:00
Michael Niedermayer
e7d85186d6 avcodec/parser: Check that the parser return code is valid 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 20:58:58 +01:00
Michael Niedermayer
6c3cb02a74 avcodec/flac_parser: Check for av_malloc() failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 17:09:39 +01:00
Michael Niedermayer
5f964c6027 avcodec/flac_parser: Use sizeof(variable) instead of sizeof(type) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 17:09:39 +01:00
Michael Niedermayer
ec9935b288 avutil/pixfmt: Support the AV_PIX_FMT_GBRAP* formats with AV_HAVE_INCOMPATIBLE_LIBAV_ABI 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 17:09:39 +01:00
Michael Niedermayer
46b0fce627 avutil/pixfmt: Document the duplicated AV_PIX_FMT_GBRAP* formats 
This is similar to the other duplicated cases

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 17:09:39 +01:00
Michael Niedermayer
b0be6d8385 avformat/id3v2: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 17:09:39 +01:00
Clément Bœsch
a83398c8d2 doc: fix showpalette position 2015-01-15 16:40:02 +01:00
Clément Bœsch
f532603993 avfilter: add showpalette filter 2015-01-15 16:36:13 +01:00
agathah
72c61c272c avcodec/nvenc: fix b frame settings 
Reviewed-by: Timo Rothenpieler <timo@rothenpieler.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 16:29:25 +01:00
Michael Niedermayer
6e69bf4a7e Merge commit '024e5a2d5ff8a94adce48abb15ce2fb471f9d18e' 
* commit '024e5a2d5ff8a94adce48abb15ce2fb471f9d18e':
  rtmppkt: Repeat the full 32 bit timestamp for chunking continuation packets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 14:45:29 +01:00
Michael Niedermayer
330e892c08 Merge commit 'def69553e745e007925147b2e7e4b32c57d08fdf' 
* commit 'def69553e745e007925147b2e7e4b32c57d08fdf':
  h264_cabac: Break infinite loops

Conflicts:
	libavcodec/h264_cabac.c

See: cdf0877bc3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 14:32:33 +01:00
Michael Niedermayer
2bc841815c Merge commit '402fb5550e36dd994b13941ef5499f9087afd345' 
* commit '402fb5550e36dd994b13941ef5499f9087afd345':
  opus_parser: drop unused variable

See: 74141f693d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 13:55:42 +01:00
Michael Niedermayer
c5eb725fd3 Merge commit '8a9641a652ed1546fedfda22584f79d3d423096e' 
* commit '8a9641a652ed1546fedfda22584f79d3d423096e':
  bsf: check memory allocations

Conflicts:
	libavcodec/noise_bsf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 13:47:12 +01:00
Michael Niedermayer
9fb5a91c66 Merge commit '014b6b416fec89777cb9cff61bcf7896eaf7cf39' 
* commit '014b6b416fec89777cb9cff61bcf7896eaf7cf39':
  vp8: improve memory allocation checks

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 13:10:48 +01:00
Michael Niedermayer
eb215be9ce Merge commit '54bc15d5ebfd07fd468743ba29f709ea19e840b9' 
* commit '54bc15d5ebfd07fd468743ba29f709ea19e840b9':
  id3v2: fix reading v2.2 attached pictures

Conflicts:
	libavformat/id3v2.c

See: 05c3c568dc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 13:01:40 +01:00
Michael Niedermayer
24c76bae5f Merge commit '932788be5af8dee062c77851b573ea47dd6d047a' 
* commit '932788be5af8dee062c77851b573ea47dd6d047a':
  id3v2: add names to the parameters of ID3v2EMFunc.read

Conflicts:
	libavformat/id3v2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 12:53:53 +01:00
Michael Niedermayer
7eef45a76f avformat/id3v2: Fix incompatible pointer type warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 12:46:13 +01:00
Michael Niedermayer
06ec2f1d32 Merge commit '8809c974a3fb51f96e498a5556a4a5bbacc581ce' 
* commit '8809c974a3fb51f96e498a5556a4a5bbacc581ce':
  id3v2: constify the 'tag' parameter to special metadata parsing callback

Conflicts:
	libavformat/id3v2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 12:45:20 +01:00
Clément Bœsch
3b3229aef3 avfilter/edgedetect: fix indent 2015-01-15 11:39:41 +01:00
Martin Storsjö
024e5a2d5f rtmppkt: Repeat the full 32 bit timestamp for chunking continuation packets 
This fixes sending chunked packets (packets larger than the output
chunk size, which often can be e.g. 4096 bytes) with a timestamp delta
(or absolute timstamp, if it's a timestamp step backwards, or the
first packet of the stream) larger than 0xffffffff.

The RTMP spec explicitly says (in section 5.3.1.3.) that packets of
type 3 (continuation packets) should include this field, if the
previous non-continuation packet had it included.

The receiving code handles these packets correctly.

Pointed out by Cheolho Park.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-01-15 10:20:18 +02:00
Michael Niedermayer
def69553e7 h264_cabac: Break infinite loops 
This fixes out of array reads and/or infinite loops.

30 is the maximum number of bits that can be read into
coeff_abs below.

CC: libav-stable@libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-01-15 10:17:01 +02:00
Michael Niedermayer
3779973a9b Merge commit 'f86f39cb9b1fcd063d5e4812132a75c06cc7acd2' 
* commit 'f86f39cb9b1fcd063d5e4812132a75c06cc7acd2':
  tiff: support decoding GBRP and GBRAP formats

Conflicts:
	libavcodec/tiff.c

See: 379ad9788b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 06:11:32 +01:00
Michael Niedermayer
27513846f6 Merge commit '928061670e873e816daa14827853b7e11221ff5f' 
* commit '928061670e873e816daa14827853b7e11221ff5f':
  libswscale: GBRAP input & output and GBRAP16 input support

Conflicts:
	libswscale/input.c
	libswscale/swscale_internal.h
	libswscale/swscale_unscaled.c
	libswscale/utils.c
	tests/ref/fate/filter-pixdesc-gbrap
	tests/ref/fate/filter-pixfmts-copy
	tests/ref/fate/filter-pixfmts-null
	tests/ref/fate/filter-pixfmts-scale
	tests/ref/fate/filter-pixfmts-vflip

See: 5c057433cc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 05:47:25 +01:00
Michael Niedermayer
5edbd4f410 Merge commit '9a4aaae3b29392b6d74997e06be249d7d54a7394' 
* commit '9a4aaae3b29392b6d74997e06be249d7d54a7394':
  lavc: add GBRAP to avcodec_align_dimensions2

See: 5c057433cc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 05:45:48 +01:00
Michael Niedermayer
ada0fc4efa Merge commit '0e6c7dfa650e8b0497bfa7a06394b7a462ddc33a' 
* commit '0e6c7dfa650e8b0497bfa7a06394b7a462ddc33a':
  lavu: add planar 16 bit and 8 bit rgb with alpha

Conflicts:
	libavutil/pixdesc.c
	libavutil/pixfmt.h
	libavutil/version.h

See: e6d4e68755
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 05:24:01 +01:00
Michael Niedermayer
55dc253c24 Merge commit 'e2ad0b66fa273c5c823978e8f601f2c0d9ee42f8' 
* commit 'e2ad0b66fa273c5c823978e8f601f2c0d9ee42f8':
  imgutils: create misc functions for dealing with buffers

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/avpicture.c
	libavutil/imgutils.c
	libavutil/imgutils.h
	libavutil/version.h

See: e6674e46ec
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 05:07:25 +01:00
Michael Niedermayer
cc18ea8de0 avformat/mov: Do not set aspect ratios that would contain zeros 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 04:26:16 +01:00
Michael Niedermayer
47795505ac avformat/mov: rewrite aspect from matrix code 
The original code was intended purely for rotation == 0
In cf70ba37ba the condition was
changed to use it only for rotation != 0
which broke the cases for which it was intended to be used
as well as breaking cases for which it was not intended to be
used.
This changes the code so it could work for the more general
case and fixes the regressions
If you have sample files that are not handled correctly
please open tickets or mail me!

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 04:22:00 +01:00
Michael Niedermayer
89b6382bec Merge commit 'cf70ba37ba74089a18295b29e77dead0a3222c9e' 
* commit 'cf70ba37ba74089a18295b29e77dead0a3222c9e':
  mov: Check angle rather than full matrix when updating SAR

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 04:00:51 +01:00
Michael Niedermayer
cd960c8a4f Merge commit '1e763454322f7fbc7799f6009bf2e11d7a3b9821' 
* commit '1e763454322f7fbc7799f6009bf2e11d7a3b9821':
  png: improve signature check

Conflicts:
	libavcodec/pngdec.c

See: 8a08503b78
See: 0a3589bf2f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 02:54:04 +01:00
Michael Niedermayer
140dfd14fd Merge commit '456ffec35d55288d589aa1901919e038c3427f30' 
* commit '456ffec35d55288d589aa1901919e038c3427f30':
  img2dec: correctly use the parsed value from -start_number

No change, start_number works fine without this change
and does not work with it

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 02:35:28 +01:00
Vittorio Giovara
402fb5550e opus_parser: drop unused variable 2015-01-15 01:25:16 +01:00
Vittorio Giovara
8a9641a652 bsf: check memory allocations 2015-01-15 01:25:16 +01:00
Vittorio Giovara
014b6b416f vp8: improve memory allocation checks 
Check memory earlier, check one more allocation and clean up on error.

CC: libav-stable@libav.org
Bug-Id: CID 1257773
 2015-01-15 01:25:07 +01:00
Michael Niedermayer
3cfd07a53f fate: add qp filter test 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-14 20:45:50 +01:00
Paul B Mahol
baea14d860 avfilter: port qp filter from libmpcodecs 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-14 18:46:38 +01:00
Anton Khirnov
54bc15d5eb id3v2: fix reading v2.2 attached pictures 
In v2.2, the picture type is not a zero-terminated string, but has a
constant size of 3 bytes.
 2015-01-14 17:17:24 +01:00
Anton Khirnov
932788be5a id3v2: add names to the parameters of ID3v2EMFunc.read 
Some of them are not immediately obvious.
 2015-01-14 17:17:24 +01:00
Anton Khirnov
8809c974a3 id3v2: constify the 'tag' parameter to special metadata parsing callback 
Those functions should not ever modify it.
 2015-01-14 17:17:24 +01:00
Paul B Mahol
f86f39cb9b tiff: support decoding GBRP and GBRAP formats 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-01-14 17:17:24 +01:00
Paul B Mahol
928061670e libswscale: GBRAP input & output and GBRAP16 input support 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-01-14 17:17:24 +01:00