virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity
43,687 Commits 37 Branches 400 Tags 467 MiB
5296d7b971
Commit Graph

34 Commits

Author SHA1 Message Date
Michael Niedermayer
c581cb4e4f Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Fix even more missing includes after the common.h removal
  build: Factor out rangecoder dependencies to CONFIG_RANGECODER
  build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE
  x86: avcodec: Consistently name all init files
  Add more missing includes after removing the implicit common.h
  Add some more missing includes after removing the implicit common.h
  Don't include common.h from avutil.h
  rtmp: Automatically compute the hash for SWFVerification

Conflicts:
	configure
	doc/APIchanges
	doc/examples/decoding_encoding.c
	libavcodec/Makefile
	libavcodec/assdec.c
	libavcodec/audio_frame_queue.c
	libavcodec/avpacket.c
	libavcodec/dv_profile.c
	libavcodec/dwt.c
	libavcodec/libtheoraenc.c
	libavcodec/rawdec.c
	libavcodec/rv40dsp.c
	libavcodec/tiff.c
	libavcodec/tiffenc.c
	libavcodec/v210dec.h
	libavcodec/vc1dsp.c
	libavcodec/x86/Makefile
	libavfilter/asrc_anullsrc.c
	libavfilter/avfilter.c
	libavfilter/buffer.c
	libavfilter/formats.c
	libavfilter/vf_ass.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_select.c
	libavfilter/video.c
	libavfilter/vsrc_testsrc.c
	libavformat/version.h
	libavutil/audioconvert.c
	libavutil/error.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-16 16:20:30 +02:00
Martin Storsjö
1d9c2dc89a Don't include common.h from avutil.h 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-08-15 22:32:06 +03:00
Michael Niedermayer
707138593a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  adpcmenc: cosmetics: pretty-printing
  ac3dec: cosmetics: pretty-printing
  yuv4mpeg: cosmetics: pretty-printing
  shorten: remove dead initialization
  roqvideodec: set AVFrame reference before reget_buffer.
  bmp: fix some 1bit samples.
  latmdec: add fate test for audio config change
  oma: PCM support
  oma: better format detection with small probe buffer
  oma: clearify ambiguous if condition
  wavpack: Properly clip samples during lossy decode
  Code clean-up for crc.c, lfg.c, log.c, random_see.d, rational.c and tree.c.
  Cleaned pixdesc.c file in libavutil
  zmbv.c: coding style clean-up.
  xan.c: coding style clean-up.
  mpegvideo.c: code cleanup - first 500 lines.

Conflicts:
	Changelog
	libavcodec/adpcmenc.c
	libavcodec/bmp.c
	libavcodec/zmbv.c
	libavutil/log.c
	libavutil/pixdesc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-05 00:11:57 +01:00
Yordan Makariev
425b45d4b0 Code clean-up for crc.c, lfg.c, log.c, random_see.d, rational.c and tree.c. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-12-03 15:13:48 -08:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Måns Rullgård
2ed6f39944 Replace many includes of libavutil/common.h with what is actually needed 
This reduces the number of false dependencies on header files and
speeds up compilation.

Originally committed as revision 22407 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 17:39:19 +00:00
Vitor Sessak
4b83fc0fe4 Plug memory leak in NUT muxer and demuxer 
Originally committed as revision 22174 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-03 17:31:24 +00:00
Vitor Sessak
8a4d067dfc Revert r22119 and partially revert 22120. 
Originally committed as revision 22135 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-01 18:16:10 +00:00
Vitor Sessak
fee6faa2b6 Implement av_tree_destroy_free_elem() to destroy a tree and free all the 
values stored on it.

Originally committed as revision 22119 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-28 20:48:42 +00:00
Michael Niedermayer
b154ed5abe Fix indention after last commit. 
Originally committed as revision 20538 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-14 19:15:09 +00:00
Michael Niedermayer
edabf35926 Fix crash with av_tree_enumerate(NULL). 
Originally committed as revision 20537 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-14 19:14:14 +00:00
Michael Niedermayer
1bf83b9548 Make sure av_tree_enumerate() enumerates left->right. 
Originally committed as revision 20535 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-14 11:19:08 +00:00
Diego Biurrun
64bde1974b cosmetics: Rename prn variable to prng (Pseudo Random Number Generator). 
Originally committed as revision 18422 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-10 17:23:38 +00:00
Benoit Fouet
168fffdf01 Fix warnings in tree.c test code. 
Originally committed as revision 18267 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-31 14:00:46 +00:00
Diego Biurrun
504ffed19f Mark non-exported functions in test and example programs as static. 
Originally committed as revision 18259 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-31 09:32:59 +00:00
Diego Biurrun
294eaa2643 Replace random() usage in test programs by av_lfg_*(). 
Originally committed as revision 18070 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-20 11:48:27 +00:00
Diego Biurrun
89c9ff504b spelling/grammar/consistency review part I 
Originally committed as revision 16840 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-28 00:16:05 +00:00
Aurelien Jacobs
045cbba92d cosmetic: indent 
Originally committed as revision 16423 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-04 17:48:54 +00:00
Aurelien Jacobs
d8bd113ef4 add a termination condition 
Originally committed as revision 16422 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-04 17:48:19 +00:00
Michael Niedermayer
eed3607564 Avoid undefined behavior for removing elements that were not in the tree. 
Originally committed as revision 15368 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-19 12:41:12 +00:00
Michael Niedermayer
51198a8737 Comment to explain how the add/remove core works. 
Originally committed as revision 11603 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-23 21:03:21 +00:00
Michael Niedermayer
5d1e3d2210 Print removing of nodes in the test code. 
Originally committed as revision 11534 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-16 01:54:56 +00:00
Michael Niedermayer
3f161c7eab simplify 
Originally committed as revision 11533 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-16 01:54:18 +00:00
Diego Biurrun
a005768d25 Remove unused variable j. 
Originally committed as revision 11472 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-08 22:53:25 +00:00
Michael Niedermayer
a35bf971c6 indent 
Originally committed as revision 11405 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-04 19:16:38 +00:00
Michael Niedermayer
2e1d287329 Flip key and element so types match, not that it matters for any code 
using it in libav*.

Originally committed as revision 11404 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-04 18:58:36 +00:00
Michael Niedermayer
d5cb5fe86b Fix selftest. 
Originally committed as revision 11401 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-04 18:21:36 +00:00
Michael Niedermayer
f05dda3b7a Support removing elements. 
Originally committed as revision 11400 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-04 18:20:03 +00:00
Michael Niedermayer
6e8b982bcc Move *malloc() out of tree.c, that way the code can be used with 
flat arrays which have lower overhead than millions of mallocd() elements.

Originally committed as revision 11399 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-04 17:52:16 +00:00
Michael Niedermayer
116d15ccf1 Always set next correctly, even if a matching element is found (that is 
how it is documented and used).

Originally committed as revision 11391 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-04 10:14:21 +00:00
Diego Biurrun
f8a80fd69d main() --> main(void) 
Originally committed as revision 11079 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-23 00:52:56 +00:00
Michael Niedermayer
eaaa48b29e 0.5l 
Originally committed as revision 7052 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-14 10:04:09 +00:00
Michael Niedermayer
3320687691 improve enumerate so arbitrary ranges can be enumerated quickly 
Originally committed as revision 7033 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-14 01:06:15 +00:00
Michael Niedermayer
9eb88fdeba AVL tree 
Originally committed as revision 7031 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-14 01:02:30 +00:00