RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
56,170 Commits 37 Branches 400 Tags 253 MiB
Commit Graph

56170 Commits

Author SHA1 Message Date
Michael Niedermayer cbe47b1e84 Merge commit 'f369b9356c4606cd4d713d60f7db5de119d901fa' 
* commit 'f369b9356c4606cd4d713d60f7db5de119d901fa':
  avformat: Use av_reallocp_array() where suitable

Conflicts:
	libavformat/asfenc.c
	libavformat/gxfenc.c
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-11 11:23:40 +02:00
Michael Niedermayer 64b6279d14 avcodec/mjpegdec: Support >8bpc color mjpeg 
Fixes Ticket2939

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-11 02:45:17 +02:00
Michael Niedermayer 7bc9fb8cde avcodec/utils: add 16bit planar YUV formats to avcodec_align_dimensions2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-11 02:45:17 +02:00
Vignesh Venkatasubramanian ae12d65538 lavcodec: Adding support for End Trimming in Opus encoder 
Adds the end trimming value (duration to be trimmed from the end
of the file due to padding) to the packet's side data. This is
then made use by the muxer to put the value in the container.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-11 01:03:07 +02:00
Vignesh Venkatasubramanian 7b0a839b0b opus/matroska: Adding support for End Trimming in demuxer/decoder 
Implementing support for end trimming Opus in Matroska by making
use of the DiscardPadding value from the container and discarding
the samples accordingly.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-10 23:11:15 +02:00
Vignesh Venkatasubramanian 889bc79b5f lavc/utils: Add support for discarding samples from the end 
Adding support for discarding samples from the end based on the value in
AV_PKT_DATA_SKIP_SAMPLES side data's bytes 5-8.

Signed-off By: Vignesh Venkatasubramanian <vigneshv@google.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-10 22:53:21 +02:00
Paul B Mahol bf5ceeffc3 avfilter/vf_psnr: >8 bit planar support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-10 16:45:48 +00:00
Timothy Gu 83165e39fe doc: Rename avtools-common-opts to fftools-common opts 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-10 18:04:03 +02:00
Paul B Mahol 942babd87f avcodec/vp56: use av_reallocp_array() and check if allocation failed 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-10 15:44:10 +00:00
Michael Niedermayer 7883827cb7 ffmpeg: check for unsupported "queing of command on first filter supporting the specific commend" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-10 14:13:44 +02:00
Michael Niedermayer 1525107313 ffmpeg: improve built in docs for passing commands 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-10 14:13:18 +02:00
Michael Niedermayer f8f4e48b6d ffmpeg: print command replies starting on column 0 
This fixes formating issues with multi-line replies

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-10 13:57:29 +02:00
Michael Niedermayer bb23bf8fd7 avfilter/avfilter: fix null pointer dereference with queued ping filters 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-10 13:39:57 +02:00
Michael Bradshaw 9b07d34efb Make avcodec_find_best_pix_fmt_of_list const-correct 
Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-10 12:46:56 +02:00
Piotr Bandurski 5cfa51929f avformat/riff: add 0x594a TwoCC 
sample:

http://samples.mplayerhq.hu/game-formats/wc4-xan/crusader-no-regret.avi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-10 12:44:26 +02:00
Alexandra Khirnova f369b9356c avformat: Use av_reallocp_array() where suitable 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-09-10 12:38:32 +02:00
Michael Niedermayer 46405813c3 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  movenc: Simplify setting the fragmentation flag

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-10 10:20:11 +02:00
Michael Niedermayer ada9b17e7a Merge commit '8b524ab0c43c1767919530abb79d3656113cdc47' 
* commit '8b524ab0c43c1767919530abb79d3656113cdc47':
  movenc: Add a warning message if conflicting options have been specified

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-10 10:08:38 +02:00
Michael Niedermayer 16ae64ce24 Merge commit 'a6a4596e12192375e1d9dffeae24d6d4c41b25c1' 
* commit 'a6a4596e12192375e1d9dffeae24d6d4c41b25c1':
  tcp: Explicitly convert a pointer to a boolean integer

Conflicts:
	libavformat/tcp.c

See: 22fbc7f8be
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-10 10:00:09 +02:00
Michael Niedermayer f7003c7a3b Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Use 0x88 as stream id when muxing DTS in program streams.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-10 02:05:13 +02:00
Carl Eugen Hoyos fe8e01361f Use 0x88 as stream id when muxing DTS in program streams. 
This is what other open source software uses and what
some hardware players expect.
Tested by trac user iuqbgq9h-1 at yahoo
 2013-09-10 01:48:59 +02:00
Vignesh Venkatasubramanian d92b1b1bab lavf/matroska: Adding support for Opus CodecDelay 
In order to represent the codec delay accurately in Matroska, a
new element CodecDelay has been introduced. It contains the
overall delay added by the codec in nanoseconds. This patch adds
support for muxing CodecDelay value in the container.
Matroska spec for CodecDelay element can be found here:
http://matroska.org/technical/specs/index.html#CodecDelay

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-10 01:45:38 +02:00
Vignesh Venkatasubramanian bb47aa5850 opus/matroska: Adding support for DiscardPadding in muxer 
Support for end trimming Opus in Matroska is implemented by using
the DiscardPadding container element in the Block data. The last
chunk is stored as a Block instead of SimpleBlock and the
trimming information is stored and used to discard samples that
were padded by the Opus codec. This patch adds support for muxing
DiscardPadding element into the container with appropriate value.
Matroska spec for the DiscardPadding element can be found here:
http://matroska.org/technical/specs/index.html#DiscardPadding

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-10 01:04:06 +02:00
Martin Storsjö bdf990425e movenc: Simplify setting the fragmentation flag 
This makes sure the faststart vs fragmentation check works as
intended when fragmentation is enabled due to using the ismv mode.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-09-09 23:58:33 +03:00
Martin Storsjö 8b524ab0c4 movenc: Add a warning message if conflicting options have been specified 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-09-09 23:57:41 +03:00
Martin Storsjö a6a4596e12 tcp: Explicitly convert a pointer to a boolean integer 
This fixes warnings about making integers from pointers without
a cast, and avoids the theoretical case where the lower 32 bits of
the pointer would all be zero where the implicit cast wouldn't give
the right result.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-09-09 23:57:04 +03:00
Paul B Mahol d1a16564a2 avcodec/ffv1: YUVA(444,422,420) 9, 10 and 16 bit support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-09 19:49:37 +00:00
Paul B Mahol a27227d401 avcodec/ffv1dec: fix format detection 
Fixes crash with carefuly designed files.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-09 19:49:01 +00:00
Reimar Döffinger 723cf4b29e Move packed B-frames message level to info. 
Since they generally decode fine, printing it as a warning
might not really be appropriate.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-09-09 20:51:08 +02:00
Reimar Döffinger 4ebf09c346 Make packed B-frame warning message more useful. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-09-09 20:51:08 +02:00
Michael Niedermayer 3576b564ec avcodec/ffv1enc: encode slice as raw PCM in 1.4 when the buffer is too small. 
This limits the maximum size of encoded slices more tightly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-09 20:20:21 +02:00
Michael Niedermayer 8393b80b7d avcodec/ffv1dec: Support decoding planes as raw PCM in 1.4 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-09 20:19:28 +02:00
Michael Niedermayer 77f521d9e5 avcodec/ffv1enc: check encode_line()s return code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-09 20:19:24 +02:00
Michael Niedermayer 3728603f18 avcodec/ffv1enc: update buffer check for 16bps 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-09 20:19:17 +02:00
Michael Niedermayer 904a2864bd avcodec/ffv1enc: fix size used for ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-09 20:19:08 +02:00
Michael Niedermayer 9a0e20817a avcodec/util: Make size argument of ff_alloc_packet2() int64_t 
This ensures that huge sizes dont get truncated before the check in ff_alloc_packet2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-09 20:18:54 +02:00
Paul B Mahol a5615b82eb avcodec/eatgv: use av_reallocp_array() and check return value 
Fixes #2949.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-09 12:26:05 +00:00
Paul B Mahol 81f231b5c7 avcodec/asfdec: check return value of av_mallocz() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-09 12:09:31 +00:00
Paul B Mahol 5e66d8ac63 avcodec/xwdenc: use AV_LOG_ERROR in error message 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-09 11:58:12 +00:00
Paul B Mahol 9bc59c108b avcodec/bmpenc: return meaningful error code 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-09 11:58:11 +00:00
Paul B Mahol 6e07bb3639 avcodec/truemotion2: use av_reallocp_array() and check return value 
Also reset tok_lens if reallocation fails.

Fixes #2946.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-09 11:53:38 +00:00
Rainer Hochecker 7d75fb381b h264: do not discard NAL_SEI when skipping frames 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-09 11:42:26 +02:00
James Almer 8702a94e49 lavu/ripemd: Add a size optimized version of the transform functions 
When compiling with --enable-small, ripemd.o will weigh a few kilobytes less than
it used to before the previous commit.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-09 11:18:48 +02:00
James Almer 452ac2aaec lavu/ripemd: Fully unroll the transform function loops 
crypto_bench RIPEMD-160 results using an AMD Athlon X2 7750+, mingw32-w64 GCC 4.8.1 x86_64

Before:
lavu       RIPEMD-160   size: 1048576  runs:   1024  time:   12.342 +- 0.199

After:
lavu       RIPEMD-160   size: 1048576  runs:   1024  time:   10.143 +- 0.192

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-09 11:18:43 +02:00
wm4 b4e1630d4d lavc: don't show "Invalid and inefficient vfw-avi..." warning in mpeg4 parser 
Only the actual decoder should print this warning.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-09 03:14:53 +02:00
Michael Niedermayer ce22820627 avcodec/mjpegdec: fix shift_output() with lowres 
Fixes Ticket2940

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-09 01:46:14 +02:00
Michael Niedermayer 7caaa72e62 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  libxvid: guess a good aspect when we cant store the exact one.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-08 23:49:33 +02:00
Paul B Mahol 43497d8a83 avcodec/proresdec2: return meaningful error codes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-08 21:44:32 +00:00
Michael Niedermayer d8fb170da2 avcodec/ratecontrol: give some trivial tips in case of buffer underflows 
See Ticket2725

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-08 23:11:39 +02:00
Carl Eugen Hoyos 43353bf32c libxvid: guess a good aspect when we cant store the exact one. 
Based on 394781a8.
 2013-09-08 22:53:14 +02:00