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

12 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
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
Mathieu Malaterre 0afdedcafb Fix a potential out of array writing. 
Patch by Mathieu Malaterre mathieu malaterre gmail com

Originally committed as revision 14487 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-31 14:53:14 +00:00
Baptiste Coudurier e516d3488a change rle encoder to count up to 127, sgi does not support 128 
Originally committed as revision 12631 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-30 17:27:58 +00:00
Diego Biurrun e5a389a1b7 license header consistency cosmetics 
Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-05 10:40:25 +00:00
Michael Niedermayer eb6905f064 dont use *int8_t for the arguments (ive missed that in the patches ...) 
Originally committed as revision 8603 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-03 06:46:12 +00:00
Xiaohui Sun b25514a43f Changed the rle encoder a little and made it more universal. 
Not only the repeated byte is calculated as (count ^ xor) + add
but also the raw encoding lenth byte is calculated as that too
patch by Xiaohui Sun sunxiaohui  dsp ac cn

Originally committed as revision 8602 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-03 06:40:21 +00:00
Michael Niedermayer 65df54496e cosmetic 
Originally committed as revision 8601 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-03 02:18:00 +00:00
Michael Niedermayer eb24fd6458 fix indention (less work to fix it myself than to check if a indention fix patch is ok ...) 
Originally committed as revision 8600 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-03 01:23:37 +00:00
Michael Niedermayer bee3851598 move doxy from .c to .h 
Originally committed as revision 8599 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-03 01:20:31 +00:00
Michael Niedermayer 1ca286e194 generic rle encoder by Bartlomiej Wolowiec b.wolowiec students mimuw edu pl 
Originally committed as revision 8598 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-03 01:01:46 +00:00