generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
29,713 Commits 24 Branches 241 Tags 173 MiB
f2bfdc3836
Commit Graph

29713 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
e74bf3f368 drawtext: simplify chroma blend and fix chroma alpha. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-05-07 10:18:16 +02:00
Stefano Sabatini
a5b64584f3 lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo 
With the following additions:
* support to anti-aliased glyph rendering
* support to UTF-8 text and Unicode chars rendering
* support for RGB packed formats
* fix minor errors and typos in the filter description
* extend/clarify examples in the filter description

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-05-07 10:17:40 +02:00
Reimar Döffinger
f44967b1b5 Use av_fast_malloc instead of av_fast_realloc. 
Avoids a memleak, is less code and might be faster.
 2011-05-07 09:58:38 +02:00
Reimar Döffinger
6266c51538 Simplify condition. 2011-05-07 09:47:35 +02:00
Reimar Döffinger
20e5d64a1a msvideo1enc: minor cosmetic cleanup, use FFALIGN, avoid calculating value 
twice and add a missing "const".
 2011-05-07 09:40:45 +02:00
Michael Niedermayer
e5a85164b1 Merge remote branch 'qatar/master' 
* qatar/master:
  mov: fix composition timestamps on movie fragments.
  wmavoice: Use proper size in memeset().
 2011-05-07 04:14:09 +02:00
Michael Niedermayer
c60d2be551 mp3enc:simplify 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-07 04:01:28 +02:00
Michael Niedermayer
e1e8a8ded4 mp3enc:better variable name for the frames field file postion. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-07 04:01:08 +02:00
Michael Niedermayer
4382bc2ceb mp3enc: drop nested structs 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-07 03:59:57 +02:00
Michael Niedermayer
f2a90c3b34 mp3enc:use FFMIN() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-07 03:58:52 +02:00
Michael Niedermayer
01be9331c7 mp3enc:Drop unneeded floating point math. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-07 03:58:51 +02:00
Michael Niedermayer
ec9a5deb20 mp3enc: drop sum and count bytes instead of bitrates from decoded headers. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-07 03:58:17 +02:00
Michael Niedermayer
7d62475656 mp3enc: remove unneeded ifdef 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-07 03:43:12 +02:00
Michael Niedermayer
173c975ead mp3enc: remove unneeded static const variables. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-07 03:43:12 +02:00
Peter Belkner
d62bf5d4e7 mp3enc: mux a XING header 
The patch below provides exactly that to the MP3 muxer. A XING header
containing

   * the numer of frames,
   * the size, and
   * a TOC

is generated.

It's based on an idea by Anton Khirnov (restricted to the number of
frames) found at

   http://patches.ffmpeg.org/patch/1891/

The TOC is generated as found in lame's "VbrTag.c".

According to my tests the following reproduces the number of frames, the
size and the TOC in "c.mp3" from "b.mp3" (except a shift due to shorter
XING header generated by FFmpeg):

   lame -V2 a.wav b.mp3
   ffmpeg -i b.mp3 -acodec copy -y c.mp3
 2011-05-07 03:27:38 +02:00
Michael Niedermayer
c34cb130b6 avfilter: dont use AVFilterLink as priv for pictures as its freed too early. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-07 01:02:38 +02:00
Michael Niedermayer
21d84246d5 avfilter: Fix ticket82 / fix initial buffer values. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-07 00:01:33 +02:00
Michael Niedermayer
39f66edbea AVFilter: use picture pool to avoid malloc(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-06 23:53:06 +02:00
Michael Niedermayer
fa3eddc011 avfilter_unref_buffer: favor av_freep() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-06 23:37:43 +02:00
Michael Niedermayer
c25a8d7dfb mpegvideo: fix 422 lowres 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-06 19:32:30 +02:00
Michael Niedermayer
a565c7b7f2 aiffdec:Rewrite get_meta() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-06 17:39:31 +02:00
JULIAN GARDNER
423986fc09 Allow encodiing empty subtitles. 2011-05-06 17:12:42 +02:00
Michael Niedermayer
95f163b33b swscale: Dither for unscaled 10->8bit per channel 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-06 15:19:27 +02:00
Michael Niedermayer
7915e038c6 swscale: dont reshuffle bytes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-06 13:18:55 +02:00
Yusuke Nakamura
45a811b512 mov: fix composition timestamps on movie fragments. 
This fixes, for instance, the case that there is a track that has some samples with composition time offset and has a track run without sample-composition-time-offsets-present.
 2011-05-05 22:07:54 -07:00
Alex Converse
869303bebd wmavoice: Use proper size in memeset(). 
sizeof(array_functrion_argument) gives the size of the pointer type not
the size of the array to which it points.
 2011-05-05 21:25:48 -07:00
Michael Niedermayer
6dc30b25c5 Merge remote branch 'qatar/master' 
* qatar/master:
  configure: warn if pkg-config is missing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-06 04:28:23 +02:00
Michael Niedermayer
187528441a avidec: correct frame_offset for seeking 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-06 03:54:35 +02:00
Carl Eugen Hoyos
cde5589717 Silence a warning if pkg_config is not installed. 2011-05-06 03:27:53 +02:00
Michael Niedermayer
ccd77fe59b Makefile:Put lost tab back. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-06 02:21:52 +02:00
Michael Niedermayer
5e24098b84 avidec: detect mpeg4 keyframes in indexless avi 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-06 02:21:36 +02:00
Baptiste Coudurier
0fa8d19987 In svq3 decoder, check negative mb_type, fix potential crash. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-06 00:30:03 +02:00
Francesco Cosoleto
6c2845600d fate: mention fate documentation in the error message 
Signed-off-by: Francesco Cosoleto <cosoleto@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-06 00:30:02 +02:00
Michael Niedermayer
757ec2d7e7 MPEG: support 4:4:4 lowres 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-05 21:44:32 +02:00
Michael Niedermayer
59b9c75d0e MPEG: support 4:4:4 intra lowres 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-05 21:42:41 +02:00
Mans Rullgard
762f95e4cb configure: warn if pkg-config is missing 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-05 18:29:55 +01:00
Stefano Sabatini
55bfb98fc6 lavfi-regression: provide filter arguments to showfiltfmts 
In do_lavfi_pixfmts(), provide the filter arguments to showfiltfmts,
since some filter may require non-null or non-empty argument string
for working properly.
 2011-05-05 18:38:48 +02:00
Stefano Sabatini
e5272e729e eval: add sqrt function for computing the square root 2011-05-05 18:38:35 +02:00
Stefano Sabatini
5d2ce3a778 configure: add strong dependencies for movie source and mp filter 2011-05-05 18:32:09 +02:00
Baptiste Coudurier
2264c11081 SVQ3: do not modify const input buffer 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-05 15:43:58 +02:00
Baptiste Coudurier
b0e7a932e6 SVQ3: Check that things match up after a frame. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-05 15:43:58 +02:00
Baptiste Coudurier
8811679c8e SVQ3: Move svq3 specific fields to their own context. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-05 15:43:46 +02:00
Michael Niedermayer
175714c0c3 ffplay: set CODEC_FLAG_EMU_EDGE earlier 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-05 15:35:54 +02:00
Michael Niedermayer
b000b86e1d Merge remote branch 'qatar/master' 
* qatar/master: (23 commits)
  doc: Check standalone compilation before submitting new components.
  Fix standalone compilation of pipe protocol.
  Fix standalone compilation of ac3_fixed encoder.
  Fix standalone compilation of binkaudio_dct / binkaudio_rdft decoders.
  Fix standalone compilation of IMC decoder.
  Fix standalone compilation of WTV demuxer.
  Fix standalone compilation of MXPEG decoder.
  flashsv: K&R cosmetics
  matroskaenc: fix memory leak
  vc1: make overlap filter for I-frames bit-exact.
  vc1dec: use s->start/end_mb_y instead of passing them as function args.
  Revert "VC1: merge idct8x8, coeff adjustments and put_pixels."
  Replace strncpy() with av_strlcpy().
  indeo3: Eliminate use of long.
  get_bits: make cache unsigned to eliminate undefined signed overflow.
  asfdec: fix assert failure on invalid files
  avfilter: check malloc return values.
Not pulled as reason for reindent is not pulled:  mpegvideo: reindent.
  nutenc: check malloc return values.
Not pulled due to much simpler solution in ffmpeg  *: don't av_malloc(0).
  ...

Conflicts:
	doc/developer.texi
	libavcodec/Makefile
	libavcodec/get_bits.h
	libavcodec/mpegvideo.c
	libavformat/Makefile
	libavutil/log.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-05 03:30:24 +02:00
Michael Niedermayer
9a5624a0f1 rgb24toyv12: break out in the middle before out of array reads. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-05 02:20:20 +02:00
alexandru_mg3
b93e12fdf4 ffplay: fix memleak if avfilter is disabled 2011-05-05 01:42:53 +02:00
Michael Niedermayer
10ff2967ea file: Fix mmap error check. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-05 00:52:03 +02:00
Michael Niedermayer
6dafa7065b configure: jack currently needs sem_timedwait() 
Should fix ticket99 and ticket43 by disabling jack.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-04 23:33:59 +02:00
Michael Niedermayer
705c65208a ffplay: removed unused variable channels. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-04 23:33:59 +02:00
Michael Niedermayer
5258f64a14 Disable warnings for casting pointers to integers, there is nothing wrong with that. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-04 23:33:59 +02:00