generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
32,873 Commits 24 Branches 241 Tags 173 MiB
682337672c
Commit Graph

15165 Commits

Author SHA1 Message Date
Michael Niedermayer
35f38b3ab9 rv34: check for size mismatch 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-17 20:17:10 +02:00
Laurent Aimar
a5dc990a4e Fix buffer size used for MC of B frames after a resolution change in the real decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-17 19:00:11 +02:00
Laurent Aimar
352c878de6 Fix js_vlc_bits value validation when joint stereo is used in cook decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-17 17:44:56 +02:00
Laurent Aimar
9a0a64cb26 Fix potential overreads in rv34 decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-17 17:38:26 +02:00
Michael Niedermayer
bfadca1faf mjpegdec: print nb_components too in pict debug info 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-17 01:38:58 +02:00
Michael Niedermayer
b002184fa1 mjpegdec: make sure we dont interpret things after the bitstream buffer as resync marker 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-17 01:38:58 +02:00
Michael Niedermayer
b6c04b6821 mjpegdec: Remove buggy avid hacks, they dont do anything good with any file i found 
Fix multi plane jpeg
Fixes ticket471

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-16 23:09:12 +02:00
Michael Niedermayer
93869d4e44 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  libx264: introduce slice-max-size option
  Fixed size given to init_get_bits().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-16 21:43:56 +02:00
Luca Barbato
3a78fb57de libx264: introduce slice-max-size option 
Yet another option useful for low latency streaming.
 2011-09-16 07:56:17 -07:00
Michael Niedermayer
cfe4e8c220 bintext: make decoder names unique 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-16 05:53:32 +02:00
Michael Niedermayer
3ac4f444e2 bintext: set buffer hints 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-16 05:53:32 +02:00
Michael Niedermayer
b9dbaa409f bintext: fix possible x variable overflow. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-16 05:53:32 +02:00
Michael Niedermayer
fa2dbcd46a bintext: remove unneeded get_buffer() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-16 05:53:31 +02:00
Peter Ross
07a70caba7 Binary text decoder 
Decoder and demuxer for various binary text formats.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-16 05:53:14 +02:00
Laurent Aimar
b59efc9434 Fixed size given to init_get_bits(). 
init_get_bits() takes a number of bits and not a number of bytes as
its size argument.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
 2011-09-15 13:23:04 -07:00
Elvis Presley
3dd47ae537 Revert "get_bits: remove x86 inline asm in A32 bitstream reader" 
This reverts commit 23ce6e7212.
 2011-09-15 15:59:04 +02:00
Elvis Presley
5554de13b2 ProRes Decoder 
Signed-off-by: Elvis Presley <elvis@e.p>
 2011-09-15 15:58:56 +02:00
Michael Niedermayer
d55b06b8e7 mjpeg: interlaced buggy avid fix 
Fix Ticket362

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-15 04:20:11 +02:00
Michael Niedermayer
e009432b50 mjpegdec: fix len for AVI1 reader 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-15 04:18:32 +02:00
Michael Niedermayer
b34c7a5656 Revert "MJPEG: emulate EOI also on two consecutive SOI." 
This causes Ticket463, fix will be in the next commits

This reverts commit 5e2ea138b7.
 2011-09-15 04:17:26 +02:00
Michael Niedermayer
205c13685f h264: allow disabling bitstream overread protection by using the fast flag. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-14 20:48:00 +02:00
Michael Niedermayer
d2a847c203 Merge remote-tracking branch 'hexene/scratchpad' 
* hexene/scratchpad:
  libstagefright: Explicitly free smart pointer objects
  Changelog: Explain why C++ support is added, and that its optional
  tools/build_libstagefright: rename build/libav to something neutral

Conflicts:
	Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-14 17:46:49 +02:00
Mohamed Naufal
e7f9aa6ff5 libstagefright: Explicitly free smart pointer objects 2011-09-14 21:01:07 +05:30
Michael Niedermayer
5166376f24 smacker: fix a few off by 1 errors 
stereo & 16bit is untested due to lack of samples

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-09-14 11:13:54 +03:00
Laurent Aimar
6489455495 Check for invalid VLC value in smacker decoder. 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-09-14 10:40:31 +03:00
Laurent Aimar
9676ffba83 Check and propagate errors when VLC trees cannot be built in smacker decoder. 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-09-14 10:38:49 +03:00
Kelly Anderson
872655fee9 dvdsubdec: fix bad free in dvdsub_init 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-14 07:14:37 +02:00
Michael Niedermayer
15240feb99 Merge remote-tracking branch 'hexene/scratchpad' 
* hexene/scratchpad:
  Move & Rename buildscript, remove tabs
  Fix regular build
  Support (H/W accelerated) H.264 decoding on Android via Stagefright
  Add build-script for Android
  C++ Support ;)

Conflicts:
	Changelog
	Makefile
	configure
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-14 01:23:16 +02:00
Michael Niedermayer
cac9877ed5 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  sws: implement MMX/SSE2/SSSE3/SSE4 versions for horizontal scaling.
  include stdint.h in adpcm_data.h
  mpeg12: reorder functions to avoid ugly forward declarations
  Fixed off by one packet size allocation in the smacker demuxer.
  Check for invalid packet size in the smacker demuxer.
  ape demuxer: fix segfault on memory allocation failure.
  xan: Add some buffer checks
  xan: Remove extra trailing newline
  Fixed size given to init_get_bits() in xan decoder.

Conflicts:
	libavcodec/mpeg12.c
	libswscale/x86/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-13 23:44:12 +02:00
Justin Ruggles
3ed7860943 include stdint.h in adpcm_data.h 
fixes make checkheaders
 2011-09-13 10:59:47 -04:00
Diego Biurrun
a05ea77c9f mpeg12: reorder functions to avoid ugly forward declarations 2011-09-13 15:53:05 +02:00
Michael Niedermayer
838e36635a avcodec: move "thread emulation" warning to common code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-13 15:05:42 +02:00
Michael Niedermayer
d67e74929c smacker: fix a few off by 1 errors 
stereo & 16bit is untested due to lack of samples

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-13 01:27:35 +02:00
Joakim Plate
32c0c562e7 dvdsubdec: Move colormap and alpha to context 
This makes it rememember old values should the stream not
contain new values for these for each subtitle.
 2011-09-13 00:26:27 +02:00
Michael Niedermayer
f98edc73c5 smacker: add forgotten * 
found by fenrir

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-12 23:55:44 +02:00
Andrew Wason
5e85fd9f9c libx264: fix overwriting presets with flags2 
This fixes overwriting x264 preset settings for flags2 based options.
See https://ffmpeg.org/trac/ffmpeg/ticket/448
 2011-09-12 22:12:47 +02:00
Andrew Wason
3eb1e65f5f libx264: fix overwriting preset rc_lookahead 
This fixes https://ffmpeg.org/trac/ffmpeg/ticket/448 - at least for
rc_lookahead. A similar problem still exists for the flags2 based
options.
 2011-09-12 21:35:24 +02:00
Joakim Plate
7009b96511 dvdsubdec: Support palette information for vobsub's stored as text in extradata 
This is how mkv's store palette information for vobsubs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-12 21:35:10 +02:00
Michael Niedermayer
9765caec1b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  adpcm: split ADPCM encoders and decoders into separate files.
  doc/avconv: fix typo.
  rv34: check that subsequent slices have the same type as first one.
  smacker demuxer: handle possible av_realloc() failure.
  lavfi: add split filter from soc.
  lavfi: add showinfo filter
  libxavs: add private options corresponding to deprecated global options

Conflicts:
	Changelog
	libavcodec/adpcm.c
	libavfilter/avfilter.h
	libavfilter/vf_showinfo.c
	libavfilter/vf_split.c
	libavformat/smacker.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-12 21:01:12 +02:00
Alex Converse
0872bb23b4 xan: Add some buffer checks 2011-09-12 11:18:57 -07:00
Alex Converse
350f57bd7b xan: Remove extra trailing newline 2011-09-12 11:18:57 -07:00
Laurent Aimar
393d5031c6 Fixed size given to init_get_bits() in xan decoder. 2011-09-12 11:18:57 -07:00
Justin Ruggles
826c56d16e adpcm: split ADPCM encoders and decoders into separate files. 
Move shared tables to a separate file as well.
 2011-09-12 11:26:11 -04:00
Kostya Shishkov
23a1f0c592 rv34: check that subsequent slices have the same type as first one. 
This prevents some crashes when corrupted bitstream reports e.g. P-type
slice in I-frame. Official RealVideo decoder demands all slices to be
of the same type too.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-12 15:51:30 +02:00
Anton Khirnov
af1e247038 libxavs: add private options corresponding to deprecated global options 
Code mostly copied from libx264 wrapper.
 2011-09-12 08:45:55 +02:00
Michael Niedermayer
716c1f7b2a h264: improve MAX_SLICES too small check so it gives less false positives. 
Fixes Ticket273

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-12 06:07:58 +02:00
Joakim Plate
340e6735fe mpeg12dec: if lavc's mpeg2 decoder was asked to drop a frame, it could still output an old frame, and mess up timestamps 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-12 04:03:40 +02:00
Michael Niedermayer
411cc5c46a Merge remote-tracking branch 'qatar/master' 
* qatar/master: (31 commits)
  audioconvert: add explanatory comments to channel_names array
  audioconvert: K&R whitespace cosmetics
  avconv: use correct index when selecting metadata to write to.
  avconv: fix inverted variable
  doc/avconv: document option types (input/output/per-stream/...)
  doc/avtools-common-opts: write a section about stream specifiers.
  doc/avconv: remove two pointless paragraphs.
  doc/avconv: document that global options should be specified first.
  doc/avconv: remove entries for nonexistent options
  doc/avconv: remove documentation for removed 'timestamp' option
  doc: cosmetics, rename fftools-common-opts to avtools-....
  avconv: move streamid_map to options context.
  avconv: extend -vf syntax
  avconv: move top_field_first to options context.
  avconv: move inter/intra matrix to options context.
  avconv: remove -psnr option.
  avconv: remove me_threshold option.
  avconv: move video_rc_override_string to options context.
  avconv: move frame pixel format to the options context.
  avconv: move frame aspect ratio to the options context.
  ...

Conflicts:
	avconv.c
	cmdutils_common_opts.h
	doc/avconv.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-12 00:32:54 +02:00
Laurent Aimar
dc255275f6 Fixed invalid read access on extra data in cinepak decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-11 21:19:46 +02:00
Laurent Aimar
d07ac1853d Fixed segfaults on corruped smacker streams in the decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-11 21:19:45 +02:00
Michael Niedermayer
fe0ac337bd mpeg4videodec: Fix new slice end detection for missing slices. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-11 17:36:37 +02:00
Anton Khirnov
d242d80e36 avconv: remove me_threshold option. 
It's only shadowing the AVOption with the same name.
 2011-09-11 17:30:04 +02:00
Edgar Hucek
3fec40b601 Fix VA-API decoding artefacts. 
Fixes ticket #457.
 2011-09-11 12:54:47 +02:00
Michael Niedermayer
ea0ac11e52 h264: prevent an out of array read in decode_nal_units() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-11 07:23:00 +02:00
Michael Niedermayer
23f5cff92c h264dec: Prevent CABAC and CAVLC bitsteram overreading 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-11 04:57:46 +02:00
Art Clarke
a52cdcd296 libspeex encoder wraper 
taken from svn head of xuggle
 2011-09-11 04:07:08 +02:00
Clément Bœsch
754d7f23ee Fix compilation with --disable-everything --enable-muxer=dv 2011-09-11 01:48:29 +02:00
Joakim Plate
4a3294ef00 dvbsubdec: don't hardcode subtitle colors count in dvbsubdec to 16 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-10 23:12:29 +02:00
Joakim Plate
8fd1da5bd2 vp3dec: set key_frame field of AVFrame 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-10 22:10:00 +02:00
Michael Niedermayer
7db7eb08e0 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Fixed segfault with wavpack decoder on corrupted decorrelation terms sub-blocks.
  avconv: move audio_channels to the options context.
  avconv: move *_disable to options context.
  avconv: remove -[vas]lang options.
  avconv: move codec tags to options context.
  cljr: init_get_bits size in bits instead of bytes
  indeo2: fail if input buffer too small
  indeo2: init_get_bits size in bits instead of bytes
  ffv1: Fixed size given to init_get_bits() in decoder.

Conflicts:
	avconv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-10 20:52:48 +02:00
Carl Eugen Hoyos
60599c68b0 Fix copmilation with --disable-everything --enable-muxer=mxf. 2011-09-10 20:39:05 +02:00
Michael Niedermayer
1eb805ed70 cabac test: Change input to test, so a wider range of states is tested. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-10 20:09:48 +02:00
Michael Niedermayer
830d7d5c4f cabac test: match encode and decode side 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-10 20:05:45 +02:00
Michael Niedermayer
89653ea728 cabac: fix cabac encoder 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-10 20:05:45 +02:00
Laurent Aimar
8bfea4ab4e Fixed segfault with wavpack decoder on corrupted decorrelation terms sub-blocks. 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-09-10 18:58:57 +03:00
Laurent Aimar
824f98f442 Fixed deference of NULL pointer in motionpixels decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-10 15:38:59 +02:00
Michael Niedermayer
78a041a9db mpeg4videodec: rewrite the slice end detection of non partitioned packets. 
This no longer needs thread syncronization thus speeding frame multithreading up.
Fixes Ticket28

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-10 03:20:29 +02:00
Laurent Aimar
e5e0580b93 Fixed size given to init_get_bits(). 
init_get_bits() takes a number of bits and not a number of bytes as
its size argument.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-10 00:26:48 +02:00
Alex Converse
0c1f5b93d9 cljr: init_get_bits size in bits instead of bytes 2011-09-09 15:01:00 -07:00
Alex Converse
b7ce4f1d1c indeo2: fail if input buffer too small 2011-09-09 15:01:00 -07:00
Alex Converse
68ca330cbd indeo2: init_get_bits size in bits instead of bytes 2011-09-09 15:01:00 -07:00
Laurent Aimar
46b004959b ffv1: Fixed size given to init_get_bits() in decoder. 
init_get_bits() takes a number of bits and not a number of bytes as
its size argument.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
 2011-09-09 15:00:28 -07:00
Laurent Aimar
8362a0ffed Fixed size given to init_get_bits() in ffv1 decoder. 
init_get_bits() takes a number of bits and not a number of bytes as
its size argument.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-09 22:19:56 +02:00
Michael Niedermayer
22bf6f7054 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  wavpack: Check error codes rather than working around error conditions.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-09 22:01:31 +02:00
Michael Niedermayer
73e0ec2ff4 rc: finetune convergence failure fix 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-09 18:50:00 +02:00
Michael Niedermayer
ed14517c23 rc: fix convergence failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-09 18:06:51 +02:00
Michael Niedermayer
78d7d8fe91 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Employ FF_ARRAY_ELEMS instead of manually calculating array length.
  Fixed invalid access in wavpack decoder on corrupted bitstream.
  Fixed invalid writes in wavpack decoder on corrupted bitstreams.
  Fixed invalid access in wavpack decoder on corrupted extra bits sub-blocks.
  rtpdec_asf: Fix integer underflow that could allow remote code execution

Conflicts:
	libavformat/rtpdec_asf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-08 22:37:31 +02:00
Chris Rankin
04c13dca88 qcelpdec: fix the return value of qcelp_decode_frame(). 2011-09-08 21:20:50 +02:00
Chris Rankin
54e1eaef67 mp3dec: Dont spam the user on multiple mp3 frames. 2011-09-08 21:04:26 +02:00
Alex Converse
dba2b63a98 wavpack: Check error codes rather than working around error conditions. 2011-09-08 11:02:43 -07:00
Laurent Aimar
55354b7de2 Fixed invalid access in wavpack decoder on corrupted bitstream. 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-09-08 12:04:06 +03:00
Laurent Aimar
0aedab0340 Fixed invalid writes in wavpack decoder on corrupted bitstreams. 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-09-08 12:00:13 +03:00
Laurent Aimar
beefafda63 Fixed invalid access in wavpack decoder on corrupted extra bits sub-blocks. 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-09-08 11:57:13 +03:00
James Zern
1da43f7e99 libvpxenc: add 'crf' private option 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-08 05:53:54 +02:00
James Zern
3dc14b4628 libvpxenc: add 'rc_lookahead' private option 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-08 05:53:54 +02:00
James Zern
fb99d78778 libvpxenc: silence AVOption related warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-08 05:53:54 +02:00
Michael Niedermayer
bd358e128f jpeglsdec: fix infinite loop 
Fixes Ticket331

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-08 05:34:17 +02:00
Michael Niedermayer
f1b5693027 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Add LATM muxer
  v210enc: clip values according to specifications
  v210enc: switch to PIX_FMT_422P10
  v210dec: switch to PIX_FMT_422P10
  AVOptions: remove AVOption.offset <= 0 checks
  AVOptions: deprecate av_opt_set_defaults2
  AVOptions: move doxy for av_opt_set_defaults() from opt.c to opt.h
  libx264: fix setting some more parameters
  libx264: fix setting the H.264 level
  libx264: add 'direct-pred' private option
  libx264: add 'partitions' private option

Conflicts:
	Changelog
	libavcodec/Makefile
	libavcodec/libx264.c
	libavcodec/v210enc.c
	libavfilter/src_movie.c
	libavformat/version.h
	libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-07 22:58:39 +02:00
Kieran Kunhya
0ca36b4de7 Add LATM muxer 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-09-07 12:57:55 +02:00
Baptiste Coudurier
635bbecfc3 v210enc: clip values according to specifications 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-07 12:50:11 +02:00
Baptiste Coudurier
d239b83e2e v210enc: switch to PIX_FMT_422P10 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-07 12:16:21 +02:00
Baptiste Coudurier
08fa23d6c2 v210dec: switch to PIX_FMT_422P10 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-07 12:16:15 +02:00
Anton Khirnov
79eff91325 AVOptions: deprecate av_opt_set_defaults2 
It's a hack which was created to allow for multiple options with
different defaults to refer to same field (e.g. 'b' vs 'ab'). There is
no need for it anymore.
 2011-09-07 11:19:43 +02:00
Anton Khirnov
0962f23b35 libx264: fix setting some more parameters 
Specifically, trellis, nr, me_range, me_method, subq, b_strategy,
keyint_min, chroma_me and coder.
Change their defaults to -1 and apply them after
x264_param_default_preset() if the user explicitly set them.
 2011-09-07 10:36:15 +02:00
Andrej Peterka
2bb5d637fc libx264: fix setting the H.264 level 
Move setting it after x264_param_default_preset()

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-07 09:16:06 +02:00
Anton Khirnov
9c684feadc libx264: add 'direct-pred' private option 
Deprecate AVCodecContext.directpred
 2011-09-07 07:27:55 +02:00
Anton Khirnov
0635a8aa21 libx264: add 'partitions' private option 
Deprecate AVCodecContext.partitions.
 2011-09-07 07:27:18 +02:00
Carl Eugen Hoyos
d898ab9090 Fix decoding of 2/4 bpp Tiff samples. 2011-09-07 01:10:14 +02:00
Carl Eugen Hoyos
f863cdef81 Cosmetics: Fix comment. 2011-09-07 01:10:14 +02:00
Michael Niedermayer
2fd4901921 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  libx264: add 'cplxblur' private option
  libx264: add 'deblock' private option
  libx264: add 'b-bias' private option
  libx264: fix setting some options.
  libx264: remove useless assignment
  ac3dec: avoid pointless alloc and indirection for input_buffer
  mpeg12: cosmetics: reformat as K&R

Conflicts:
	libavcodec/libx264.c
	libavcodec/mpeg12.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-06 21:35:18 +02:00
Anton Khirnov
7042337673 libx264: add 'cplxblur' private option 
Deprecate AVCodecContext.complexityblur
 2011-09-06 21:03:41 +02:00
Anton Khirnov
71b5f4427b libx264: add 'deblock' private option 
Deprecate AVCodecContext.deblockalpha/deblockbeta
 2011-09-06 21:02:45 +02:00
Anton Khirnov
f83c45183e libx264: add 'b-bias' private option 
Deprecate AVCodecContext.bframebias.
 2011-09-06 20:14:35 +02:00
Anton Khirnov
bb73cda2f6 libx264: fix setting some options. 
Specifically: gop_size, max_b_frames, scenechange_threshold, qmin, qmax,
max_qdiff, qblur, qcompress and refs.

Change their default values to -1 and only use them if the user
explicitly set them. Otherwise x264 defaults are used.

Move setting those options after x264_param_default_preset(), so they
don't get overwritten by it.
 2011-09-06 20:13:28 +02:00
Anton Khirnov
d8dee0e7bd libx264: remove useless assignment 
priv_data is memset to 0.
 2011-09-06 20:13:11 +02:00
Michael Niedermayer
0c9cba24b7 pngdec: implement 4bpp interlaced 
Fixes Ticket435

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-06 19:50:01 +02:00
Michael Niedermayer
dcabb3d608 pngdec: implement 2 bpp interlaced. 
Fixes Ticket434

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-06 19:50:01 +02:00
Reimar Döffinger
459fe331e9 ac3dec: avoid pointless alloc and indirection for input_buffer 
Since we now always allocate it, it can simply be made part of the context
instead.
 2011-09-06 12:43:16 -04:00
Michael Niedermayer
be7eed72c8 mjpegdec; even better RSTn skiping 
Fixes Ticket426

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-06 18:20:34 +02:00
Michael Niedermayer
bc6445f2db pngdec: Fix interlaced PAETH prediction 
Fixes Ticket161

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-06 16:22:38 +02:00
Michael Niedermayer
2d4102fc13 pngdec: Implement 2bpp 
Fixes Ticket433

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-06 15:48:01 +02:00
Michael Niedermayer
dc43ad6d1a pngdec: Fix interlaced 1bpp 
Fixes Ticket214

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-06 15:28:36 +02:00
Michael Niedermayer
738219c921 pngdec: 4bpp support 
Fixes Ticket208

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-06 14:11:04 +02:00
Diego Biurrun
6192b6f3e7 mpeg12: cosmetics: reformat as K&R 2011-09-06 11:46:57 +02:00
Michael Niedermayer
6dbac85f8d mpeg4: fix another packed divx issue. 
Fixes getting_stuck.avi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-06 04:09:43 +02:00
Michael Niedermayer
3c54e7ed4f Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  ac3enc: Add channel coupling support for the fixed-point AC-3 encoder.
  ac3enc: scale floating-point coupling channel coefficients in scale_coefficients() rather than in apply_channel_coupling()
  ac3enc: fix encoding of stereo ac3 files when rematrixing is disabled.
  wavpack: fix wrong return value in wavpack_decode_block()
  avconv: fix parsing metadata specifiers.
  fate: use +frame+slice named constants instead of '3'
  mpeg12: propagate more real return values through chunk decode error return and fix some indentation
  wavpack: use context reset in appropriate places
  avconv: move mux_preload and mux_max_delay to options context
  avconv: move bitstream filters to options context.
  avconv: move rate_emu to options context.
  avconv: move max_frames to options context.
  avconv: move metadata to options context.
  avconv: move ts scale to options context.
  avconv: move chapter maps to options context.
  avconv: move metadata maps to options context.
  avconv: move codec_names to options context.

Conflicts:
	avconv.c
	tests/fate-run.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-05 22:29:16 +02:00
Justin Ruggles
ae264bb29b ac3enc: Add channel coupling support for the fixed-point AC-3 encoder. 
Update FATE references accordingly.
 2011-09-05 10:09:44 -04:00
Justin Ruggles
a0d17b6d45 ac3enc: scale floating-point coupling channel coefficients in 
scale_coefficients() rather than in apply_channel_coupling()
 2011-09-05 10:07:43 -04:00
Justin Ruggles
3e5722a8ca ac3enc: fix encoding of stereo ac3 files when rematrixing is disabled. 
The number of rematrixing bands still needs to be calculated.
 2011-09-05 09:24:59 -04:00
Kostya Shishkov
bcd4aa8bec wavpack: fix wrong return value in wavpack_decode_block() 
This function should return number of samples decoded, not number of bytes
decoded.
Spotted by Uoti Urpala.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-09-05 12:44:26 +02:00
Dustin Brody
ff17fc6353 mpeg12: propagate more real return values through chunk decode error return and fix some indentation 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-05 11:19:14 +02:00
Kostya Shishkov
9bc4e21a9b wavpack: use context reset in appropriate places 
This fixes improper flushing in the cases when the same frame is decoded in
several iterations (for being too large to fit into output buffer) and flush is
called mid-decoding and it also resets context in case of decoding errors.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-05 11:18:27 +02:00
Michael Niedermayer
d2084402e6 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavc: fix type for thread_type option
  avconv: move format to options context
  avconv: move limit_filesize to options context
  avconv: move start_time, recording_time and input_ts_offset to options context
  avconv: add a context for options.
  cmdutils: allow storing per-stream/chapter/.... options in a generic way
  cmdutils: split per-option code out of parse_options().
  cmdutils: add support for caller-provided option context.
  cmdutils: declare only one pointer type in OptionDef
  cmdutils: move grow_array() from avconv to cmdutils.
  cmdutils: move exit_program() declaration to cmdutils from avconv
  http: Consider the stream as seekable if the reply contains Accept-Ranges: bytes
  nutenc: add namespace to the api facing functions

Conflicts:
	avconv.c
	cmdutils.c
	cmdutils.h
	ffmpeg.c
	ffplay.c
	ffprobe.c
	ffserver.c
	libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-05 03:10:45 +02:00
Reimar Döffinger
09c5f990bc Check extradata size on resolution change. 
Ignore resolution change if resolution not defined in extradata.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-09-04 16:09:40 +02:00
Anton Khirnov
fb47997edb lavc: fix type for thread_type option 
It should be flags, not int.
 2011-09-04 13:15:36 +02:00
Michael Niedermayer
1889c6724a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  AVOptions: fix av_set_string3() doxy to match reality.
  cmdutils: get rid of dummy contexts for examining AVOptions.
  lavf,lavc,sws: add {avcodec,avformat,sws}_get_class() functions.
  AVOptions: add AV_OPT_SEARCH_FAKE_OBJ flag for av_opt_find().
  cpu detection: avoid a signed overflow

Conflicts:
	avconv.c
	cmdutils.c
	doc/APIchanges
	ffmpeg.c
	libavcodec/options.c
	libavcodec/version.h
	libavformat/version.h
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-04 04:11:53 +02:00
Anton Khirnov
fb4ca26bdb lavf,lavc,sws: add {avcodec,avformat,sws}_get_class() functions. 2011-09-03 20:53:35 +02:00
Anton Khirnov
c11fb8288d AVOptions: add AV_OPT_SEARCH_FAKE_OBJ flag for av_opt_find(). 
It allows to search for options only with AVClass, without allocating
the corresponding context.
 2011-09-03 20:52:21 +02:00
Michael Niedermayer
3e7e1f1509 mpeg4: adjust dummy frame threashold for packed divx. 
Fixes Ticket427

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-02 18:04:28 +02:00
Michael Niedermayer
63d2cfd142 dvdec: Fix dvsd profile[1] detection. 
Fixes Ticket159
If someone knows of a cleaner way to detect this, patch is welcome.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-02 05:21:25 +02:00
Michael Niedermayer
fea20d1ddc Revert "mjpeg: treat external huffman table setup failure as codec init failure if external huffman table use requested" 
This broke mplayer

This reverts commit a18e04bcf9.
 2011-09-02 01:18:22 +02:00
Michael Niedermayer
94c2478d90 jpegdec: better rst skiping 
Fixes Ticket426

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-02 01:09:39 +02:00
Reimar Döffinger
5e2ea138b7 MJPEG: emulate EOI also on two consecutive SOI. 
Fixes issue #362.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-09-01 22:54:35 +02:00
Reimar Döffinger
55a1fe7a80 Reset cur_scan at more appropriate places. 
Reset it when we actually process an EOI, not when we actually
decide to ignore it for bug-workarounds, and reset it on
SOF to make it more reliable in case of missing EOI.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-09-01 22:54:35 +02:00
Michael Niedermayer
58677d73ed Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avconv: fix some bugs introduced in 630902a1e1
  libmp3lame: fix typo
  AVOptions: drop av_ prefix from static av_get_number().
  libx264: use X264_THREADS_AUTO constant instead of 0.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-01 22:08:44 +02:00
Clément Bœsch
acc3c380cb resample: fix typo (ouput → output). 2011-09-01 20:25:32 +02:00
Clément Bœsch
b85e9d3104 resample: fix set but unused variable (lfe) warning. 2011-09-01 20:23:40 +02:00
Clément Bœsch
f067d8a618 imgconvert: avoid mixed declarations and code. 2011-09-01 20:23:40 +02:00
Gavin Kinsey
2f870e262e jpegdec: set color_range 2011-09-01 16:18:22 +02:00
Anton Khirnov
9bc9188e58 libmp3lame: fix typo 
FF_API_LAME_GLOBAL_OPTIONS => FF_API_LAME_GLOBAL_OPTS

Thanks to Clément Bœsch for spotting.
 2011-09-01 10:37:19 +02:00
Anton Khirnov
1440037411 libx264: use X264_THREADS_AUTO constant instead of 0. 2011-09-01 10:12:30 +02:00
Michael Niedermayer
a538e0f9a0 vc1: loose one line difference to qatar. 
This should make no functional difference.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-01 02:38:56 +02:00
Michael Niedermayer
f5bda9fcbb mpeg4: fix typo in mpeg4_encode_gop_header() 
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-01 02:22:36 +02:00
Diego Biurrun
aebb56e184 Replace some commented-out debug printf() / av_log() messages with av_dlog(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-01 01:31:03 +02:00
Michael Niedermayer
0ed7bc49a3 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (31 commits)
  libx264: set default thread count to 0 (auto)
  lavc: cosmetics, group deprecated codec flags
  mpeg12: add 'scan_offset' private option.
  h263/p encoder: add 'structured_slices' private option.
  h263/p encoder: add 'obmc' private option.
  h263p encoder: add 'aiv' private option.
  h263p encoder: add 'umv' private option.
  mpeg12enc/mpeg4videoenc: add 'alternate_scan' private option.
  mjpegdec: add 'extern_huff' private option.
  mpeg4enc: add 'data_partitioning' private option.
  snow: add 'memc_only' private option.
  libx264: add 'mbtree' private option.
  libx264: add 'psy' private option.
  libmp3lame: add 'reservoir' private option.
  mpeg2enc: add 'non_linear_quant' private option
  mpeg12enc: add drop_frame_timecode private option.
  mpeg12enc: add intra_vlc private option.
  VC1: Support dynamic dimension changes
  mjpeg: treat external huffman table setup failure as codec init failure if external huffman table use requested
  lavc: deprecate CODEC_FLAG2_BRDO
  ...

Conflicts:
	avconv.c
	libavcodec/libmp3lame.c
	libavcodec/libx264.c
	libavcodec/mjpegdec.c
	libavcodec/mpeg12enc.c
	libavcodec/mpegvideo.h
	libavcodec/vc1.c
	libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-01 00:01:21 +02:00
Anton Khirnov
5d06f15235 libx264: set default thread count to 0 (auto) 2011-08-31 17:39:13 +02:00
Anton Khirnov
f013cb8118 lavc: cosmetics, group deprecated codec flags 2011-08-31 13:28:54 +02:00
Anton Khirnov
aed7900704 mpeg12: add 'scan_offset' private option. 
Deprecate CODEC_FLAG_SVCD_SCAN_OFFSET
 2011-08-31 13:28:41 +02:00
Anton Khirnov
4bcee8e7f8 h263/p encoder: add 'structured_slices' private option. 
Deprecate CODEC_FLAG_H263P_SLICE_STRUCT
 2011-08-31 13:28:26 +02:00
Anton Khirnov
0d904de89d h263/p encoder: add 'obmc' private option. 
Deprecate CODEC_FLAG_OBMC
 2011-08-31 13:28:11 +02:00