1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Commit Graph

8 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
Mark Cox
8d06bd53f8 Fix unused variable warnings.
patch by mark cox, melbournemark+ffmpeg gmail.com

Originally committed as revision 12370 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 17:18:28 +00:00
Michael Niedermayer
b85976ba64 better include
Originally committed as revision 12257 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 23:51:59 +00:00
Diego Biurrun
dc3f320dfd Add explanatory comment to '#define FLOAT float'.
Originally committed as revision 12254 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 22:52:01 +00:00
Michael Niedermayer
cc6116756c Remove another temporary variable with which gcc has problems.
Originally committed as revision 12243 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 18:36:58 +00:00
Michael Niedermayer
6f08c541b4 floating point AAN IDCT
Originally committed as revision 12233 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 14:59:11 +00:00