Commit Graph

28 Commits

Author SHA1 Message Date
Michael Niedermayer
98277fd1a0 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  bitstream_filter: K&R formatting cosmetics

Conflicts:
	libavcodec/bitstream_filter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-06 12:08:43 +02:00
Luca Barbato
4972e5a186 bitstream_filter: K&R formatting cosmetics 2013-07-05 19:38:24 +02:00
Stefano Sabatini
41fe750f4b lavc/bitstream_filter: do not crash in case the argument of av_bitstream_filter_close() is NULL 2013-07-05 00:58:03 +02:00
Michael Niedermayer
b36b5edb8f avcodec/bitstream_filter: make av_register_bitstream_filter() thread safe
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-29 03:39:03 +02:00
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
a78f6b8cb9 Merge remote-tracking branch 'qatar/master'
* qatar/master: (38 commits)
  v210enc: remove redundant check for pix_fmt
  wavpack: allow user to disable CRC checking
  v210enc: Use Bytestream2 functions
  cafdec: Check return value of avio_seek and avoid modifying state if it fails
  yop: Check return value of avio_seek and avoid modifying state if it fails
  tta: Check return value of avio_seek and avoid modifying state if it fails
  tmv: Check return value of avio_seek and avoid modifying state if it fails
  r3d: Check return value of avio_seek and avoid modifying state if it fails
  nsvdec: Check return value of avio_seek and avoid modifying state if it fails
  mpc8: Check return value of avio_seek and avoid modifying state if it fails
  jvdec: Check return value of avio_seek and avoid modifying state if it fails
  filmstripdec: Check return value of avio_seek and avoid modifying state if it fails
  ffmdec: Check return value of avio_seek and avoid modifying state if it fails
  dv: Check return value of avio_seek and avoid modifying state if it fails
  bink: Check return value of avio_seek and avoid modifying state if it fails
  Check AVCodec.pix_fmts in avcodec_open2()
  svq3: Prevent illegal reads while parsing extradata.
  remove ParseContext1
  vc1: use ff_parse_close
  mpegvideo parser: move specific fields into private context
  ...

Conflicts:
	libavcodec/4xm.c
	libavcodec/aacdec.c
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/mpeg4video_parser.c
	libavcodec/svq3.c
	libavcodec/v210enc.c
	libavformat/cafdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-11 01:22:22 +01:00
Martin Storsjö
e7d4a2a721 libavcodec: Don't do av_free(av_malloc(0)) for bitstream filters
This fixes crashes on exit when closing a bitstream filter that
hasn't allocated any private data, on OS X.

Signed-off-by: Martin Storsjö <martin@martin.st>
2012-02-09 23:13:50 +02: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
Diego Pettenò
e6df765ed3 Mark list heads static. Patch by Diego Pettenò
Originally committed as revision 15548 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 09:29:31 +00:00
Michael Niedermayer
55b9e69a31 av_*_next() API for libavcodec
Originally committed as revision 11204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-12 18:40:11 +00:00
Benoit Fouet
0a1a0a805a add a close function to bitstream filter
Originally committed as revision 10288 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-04 06:48:22 +00:00
Aurelien Jacobs
8bf63e1c80 move dump_extradata bitstream filter in its own file
Originally committed as revision 9066 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-19 00:35:27 +00:00
Aurelien Jacobs
5209c83607 move remove_extradata bitstream filter in its own file
Originally committed as revision 9065 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-19 00:32:11 +00:00
Aurelien Jacobs
cd7105e6a0 move noise bitstream filter in its own file
Originally committed as revision 9064 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-19 00:30:15 +00:00
Aurelien Jacobs
a975d9e288 move mp3_header_compress bitstream filter in its own file
Originally committed as revision 9063 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-19 00:27:43 +00:00
Aurelien Jacobs
b57eed12da move mp3_header_decompress bitstream filter in its own file
Originally committed as revision 9062 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-19 00:24:34 +00:00
Aurelien Jacobs
677fe2e226 add proper prefix to extern mpeg audio data tables
Originally committed as revision 9061 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-19 00:13:35 +00:00
Aurelien Jacobs
4991c0516d move some common mpeg audio tables from mpegaudiodectab.h to mpegaudiodata.c
Originally committed as revision 9060 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-19 00:06:02 +00:00
Jason Millard
cd61e40781 allow to enable or disable every bitstream filters individually
Original patch by Jason Millard   jsm174 _at_ gmail
Date: On Fri, 11 May 2007 11:14:01 -0400
Subject: [FFmpeg-devel] enable/disable bitstream filters?

Originally committed as revision 9010 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-12 23:33:53 +00:00
Alex Beregszaszi
fead30d444 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
Originally committed as revision 7587 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-19 22:12:59 +00:00
Michael Niedermayer
f1a06ca80b zero private bits
Originally committed as revision 6961 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-10 11:45:43 +00:00
Michael Niedermayer
eea784dab0 store a identifer and the first header in extradata
with this mp3 should be binary identical to what you had before header compression
support mp3 with crc (by droping the crc and putting it back during header decompress, currently its just random tough, does any deocoder even check it?)

Originally committed as revision 6960 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-10 11:31:02 +00:00
Michael Niedermayer
eacb41b2e9 mp3 header (de)compression bitstream filter
this will make mp3 frames 4 bytes smaller, it will not give you binary identical mp3 files, but it will give you mp3 files which decode to binary identical output
this will only work in containers providing at least packet size, sample_rate and number of channels
bugreports about mp3 files for which this fails are welcome
and this is experimental (dont expect compatibility and dont even expect to be able to decompress what you compressed, hell dont even expect this to work without editing the source a little)

Originally committed as revision 6958 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-10 01:41:53 +00:00
Diego Biurrun
b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-07 15:30:46 +00:00
Diego Biurrun
04d7f60143 Add official LGPL license headers to the files that were missing them.
Originally committed as revision 6219 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-10 14:02:42 +00:00
Michael Niedermayer
514e0831ae noise bitstream filter
add priv_data field to AVBitStreamFilterContext

Originally committed as revision 5644 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-06 15:28:17 +00:00
Michael Niedermayer
748c2fca7e AVBitStreamFilter (some thingy which can modify the bitstream like add or remove global headers or change the headers or ...)
Originally committed as revision 5643 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-06 15:04:46 +00:00