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

56150 Commits

Author SHA1 Message Date
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ö 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
Paul B Mahol cd6241b5df avcodec/truemotion2: use av_calloc() & av_malloc_array() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-08 18:56:06 +00:00
Michael Niedermayer c54aa2fb0f avcodec/truemotion2: Fix av_freep arguments 
Fixes null pointer dereference
Fixes Ticket2944

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-08 20:27:54 +02:00
Michael Niedermayer 8586d8dda2 avformat/avidec: fix signedness of pointer type in get_stream_idx() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-08 19:02:19 +02:00
Clément Bœsch 3a54c221d5 avcodec/srtdec: fix potential overread. 2013-09-08 18:50:25 +02:00
Clément Bœsch 860a081058 avcodec/assenc: fix potential overread. 2013-09-08 18:50:25 +02:00
Clément Bœsch 378a830e7b avformat/subtitles: support standalone CR (MacOS). 
Recent .srt files with CR only were found in the wild.
 2013-09-08 18:48:35 +02:00
Clément Bœsch 90fc00a623 avformat/subtitles: add a next line jumper and use it. 
This fixes a bunch of possible overread in avformat with the idiom p +=
strcspn(p, "\n") + 1 (strcspn() can focus on the trailing '\0' if no
'\n' is found, so the +1 leads to an overread).

Note on lavf/matroskaenc: no extra subtitles.o Makefile dependency is
added because only the header is required for ff_subtitles_next_line().

Note on lavf/mpsubdec: code gets slightly complex to avoid an infinite
loop in the probing since there is no more forced increment.
 2013-09-08 18:48:09 +02:00
Clément Bœsch cfcd55db16 avformat/srtdec: skip initial random line breaks. 
I found a bunch of (recent) SRT files in the wild with 3 to 10 line
breaks at the beginning.
 2013-09-08 18:37:07 +02:00
Paul B Mahol 7d7b4e8d5c avcodec/png: remove obsolete comments 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-08 15:13:33 +00:00
Michael Niedermayer c914c99d4b swscale/utils: use memcpy instead of loop in sws_cloneVec() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-08 16:39:38 +02:00
Paul B Mahol 14851ca5f5 avformat/matroskaenc: remove bogus prores tag 
Fixes: ffmpeg -i input -c:v prores output.mkv

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-08 13:03:08 +00:00
Giorgio Vazzana 7f6ec05f09 lavd/v4l2: Improve debug message 
In particular, print the standard supported by the selected input.
Additionally, use PRIx64 everywhere when printing standards.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-08 14:30:52 +02:00
Paul B Mahol 0227b42926 avfilter/vf_psnr: refactor subsampled format support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-08 12:01:44 +00:00
Clément Bœsch b1319e14e3 avformat/subtitles: binary search seeking. 2013-09-08 12:54:49 +02:00
Clément Bœsch 1ca4bf930b avformat/subtitles: check lower bound for duration overlap seeking. 2013-09-08 12:54:49 +02:00
Clément Bœsch f8678dcef3 avformat/vobsub: fix seeking. 2013-09-08 12:54:49 +02:00
Michael Niedermayer 53fb52ac85 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavf: fix the comparison in an overflow check

Conflicts:
	libavformat/utils.c

See: a5d67bc796
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-08 12:29:07 +02:00
Michael Niedermayer 13e35a25f6 Merge commit '7ee191cab0dc44700f26c5784e2adeb6a779651b' 
* commit '7ee191cab0dc44700f26c5784e2adeb6a779651b':
  dv: Add a guard to not overread the ppcm array

See: 3669915e93
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-08 11:51:36 +02:00
Michael Niedermayer 58e5f6a433 oMerge commit '85ac12587bfef970d0e0e4abc292df346daf8478' 
* commit '85ac12587bfef970d0e0e4abc292df346daf8478':
  nuv: check ff_rtjpeg_decode_frame_yuv420 return value

Conflicts:
	libavcodec/nuv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-08 11:40:45 +02:00
James Almer e3d34100e7 doc: add *install-doc that covers all documentation 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-08 05:25:17 +02:00