ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-10-07 02:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,083 Commits 37 Branches 400 Tags 498 MiB
328810390d
Commit Graph

80 Commits

Author SHA1 Message Date
Michael Niedermayer
b8a4b0152a error concealment: check last pictures motion_val before using it. 
Fixes NULL pointer dereference.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-12 03:03:08 +02:00
Michael Niedermayer
3732c48304 error_concealment: Use previous pictures motion vectors when the current ones have been lost. 
Looks better for some cases, worse for others, overall not much difference.
Its more correct though.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-11 00:57:59 +02:00
Multiple Authors
a811ec7cb5 Merging branch 'ffmpeg-mt/master' 
Just some cosmetics & comments, the only functional change
"error_resilience: use s->last_picture for accessing last MVs."
Is so buggy that it needs a full rewrite, guess -1.0 PSNR loss wasnt
enough for ronald to realize there was a problem.
 2011-05-11 00:57:59 +02:00
Stefano Sabatini
ce5e49b0c2 replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_* 2011-05-02 16:41:41 +02:00
Michael Niedermayer
7b9e98173c Revert "Eliminate pointless '#if 1' statements without matching '#else'." 
no comment

This reverts commit e6ff064845.

Conflicts:

	libavcodec/dsputil.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-27 04:13:28 +02:00
Michael Niedermayer
d7e5aebae7 Merge remote branch 'qatar/master' 
* qatar/master: (23 commits)
  ac3enc: correct the flipped sign in the ac3_fixed encoder
  Eliminate pointless '#if 1' statements without matching '#else'.
  Add AVX FFT implementation.
  Increase alignment of av_malloc() as needed by AVX ASM.
  Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX.
  mjpeg: Detect overreads in mjpeg_decode_scan() and error out.
  documentation: extend documentation for ffmpeg -aspect option
  APIChanges: update commit hashes for recent additions.
  lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums
  aac: add headers needed for log2f()
  lavc: remove FF_API_MB_Q cruft
  lavc: remove FF_API_RATE_EMU cruft
  lavc: remove FF_API_HURRY_UP cruft
  pad: make the filter parametric
  vsrc_movie: add key_frame and pict_type.
  vsrc_movie: fix leak in request_frame()
  lavfi: add key_frame and pict_type to AVFilterBufferRefVideo.
  vsrc_buffer: add sample_aspect_ratio fields to arguments.
  lavfi: add fieldorder filter
  scale: make the filter parametric
  ...

Conflicts:
	Changelog
	doc/filters.texi
	ffmpeg.c
	libavcodec/ac3dec.h
	libavcodec/dsputil.c
	libavfilter/avfilter.h
	libavfilter/vf_scale.c
	libavfilter/vf_yadif.c
	libavfilter/vsrc_buffer.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-27 03:51:04 +02:00
Diego Biurrun
e6ff064845 Eliminate pointless '#if 1' statements without matching '#else'. 2011-04-26 20:18:27 +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 Biurrun
ba87f0801d Remove explicit filename from Doxygen @file commands. 
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.

Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-20 14:45:34 +00:00
Diego Biurrun
e5d2bdec11 Add rectangle.h #include for fill_rectangle(). 
Originally committed as revision 22877 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-13 22:52:14 +00:00
Michael Niedermayer
c28112fab6 Make sure the EC code does not attempt to use inter based concealment if there 
is no reference frame available. (this can happen because the EC code will attempt
to use reference frames even for I/IDR frames)

Originally committed as revision 22732 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-30 20:46:46 +00:00
Michael Niedermayer
fc4a2d1e8c Change ref_index structure so it matches how its organized in h264. 
Also revert the related error concealment hotfix.

Originally committed as revision 22640 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-23 02:17:04 +00:00
Aurelien Jacobs
3546fa8d87 fix compilation with --disable-everything --enable-decoder=mpeg2video 
Originally committed as revision 22612 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-20 23:18:07 +00:00
Michael Niedermayer
b297129bdb Hotfix for regtest-error failure 
a proper fix appears to require changing h263/mpeg2/motion est to index ref_index like
h264. Ill do this change and then revert this hotfix but it will take a bit time.

Originally committed as revision 22608 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-20 16:51:36 +00:00
Michael Niedermayer
673fc6388f Error concealment of h264 with multiple references. 
Originally committed as revision 22603 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-20 00:52:08 +00:00
Michael Niedermayer
68f0bc7e62 Use H264s MC instead of mpeg4-asp qpel for h264 error resilience. 
Originally committed as revision 22572 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-17 02:59:12 +00:00
Michael Niedermayer
686c781766 Make sure all mvs of a mb are set in the error concealment code. 
Originally committed as revision 22520 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-14 01:52:31 +00:00
Michael Niedermayer
bb4fcfa395 Ensure that the deblock filter accesses the correct MVs for h264. 
Originally committed as revision 22517 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-14 00:42:26 +00:00
Michael Niedermayer
2c4bc23e7a Fix guess_mv() so that it works correctly with 4x4 MV blocks. 
Originally committed as revision 22485 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-12 16:59:21 +00:00
Michael Niedermayer
358b5b1a59 Get rid of mb2b8_xy and b8_stride, change arrays organized based on b8_stride to 
ones based on mb_stride in h264.
about 20 cpu cycles faster overall per MB

Originally committed as revision 22065 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-25 23:44:42 +00:00
Michael Niedermayer
f40a7fd316 4:2:2 4:4:4 bugfix for the error concealment code. 
Originally committed as revision 20678 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-01 01:01:37 +00:00
Michael Niedermayer
fd1ef13bb4 Disable error resilience for field pictures, this was never supported, 
results where more or less random but should not have crashed.

Originally committed as revision 20671 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-30 19:15:19 +00:00
Reimar Döffinger
b6b6676085 Make sure error resilience does not try to use unavailable reference frames. 
Fixes the crash described in issue 706.

Originally committed as revision 18407 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-10 07:17:30 +00:00
Gwenole Beauchesne
11647a9f8c Return early if a HW accelerator is used. 
Patch by Gwenole Beauchesne.

Originally committed as revision 17635 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-27 08:16:22 +00:00
Gwenole Beauchesne
40e5d31b57 More approved hunks for VAAPI & our new and cleaner hwaccel API. 
patch by Gwenole Beauchesne gbeauchesne splitted-desktop com

Originally committed as revision 17540 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-23 13:44:51 +00:00
Diego Biurrun
83344066d3 Get rid of some '#if CONFIG_MPEG_XVMC_DECODER' preprocessor checks around if 
statements by merging the CONFIG_MPEG_XVMC_DECODER check into the if condition.

Originally committed as revision 17369 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-16 11:49:08 +00:00
Diego Biurrun
fc2dd7e3de Remove redundant CONFIG_XVMC option, CONFIG_MPEG_XVMC_DECODER suffices. 
Originally committed as revision 17229 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-14 15:37:40 +00:00
Diego Biurrun
bad5537e2c Use full internal pathname in doxygen @file directives. 
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.

Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-01 02:00:19 +00:00
Aurelien Jacobs
b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*. 
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 23:44:16 +00:00
Carl Eugen Hoyos
7eb6ed78ea Move VDPAU check, make future VDPAU patches smaller. 
Originally committed as revision 16508 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-09 22:22:40 +00:00
Diego Biurrun
b24298badc Switch xvmc over to a CONFIG_ option. 
Originally committed as revision 16153 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-15 22:22:51 +00:00
Michael Niedermayer
8c07cee91a Do not attempt to perform error concealment in lowres mode as this is 
not supported currently.

Originally committed as revision 15465 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-30 00:28:13 +00:00
Michael Niedermayer
68997192eb Ensure that no non-existing frame is used. 
Fixes issue624.

Originally committed as revision 15416 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-25 19:25:28 +00:00
Michael Niedermayer
047599a4ba Rename error_resilience to error_recognition. 
Originally committed as revision 15270 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-08 18:18:49 +00:00
Diego Biurrun
04932b0d97 cosmetics: typo fixes 
Originally committed as revision 12554 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-22 16:46:36 +00:00
Diego Biurrun
d952638699 typo: occured --> occurred 
Originally committed as revision 12549 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-22 01:06:57 +00:00
Aurelien Jacobs
9701840bb5 add FF_ prefix to all (frame)_TYPE usage 
Originally committed as revision 12399 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-09 23:31:02 +00:00
Diego Biurrun
5e53486545 typo fix: inited --> initialized 
Originally committed as revision 11920 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-13 09:26:10 +00:00
Ivan Kalvachev
551109d48a On bitstream error is_intra_more_likely() could use dsp.sad[0]() that will segfault when xvmc is in use. 
Originally committed as revision 10610 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-28 20:38:32 +00:00
Diego Biurrun
755bfeabcc misc spelling fixes 
Originally committed as revision 9289 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-12 09:29:25 +00:00
Diego Biurrun
2029f312e8 Remove redundant #inclusion of common.h, avcodec.h already #includes it. 
Originally committed as revision 8967 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-10 09:00:44 +00:00
Reimar Döffinger
f66e4f5f9e Add av_ prefix to clip functions 
Originally committed as revision 8122 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-25 10:27:12 +00:00
Michael Niedermayer
04cfef21ff sanity check 
Originally committed as revision 7890 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-09 02:25:23 +00:00
Måns Rullgård
55fde95e3b rename cropTbl -> ff_cropTbl 
Originally committed as revision 6992 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-12 20:08:09 +00:00
Diego Biurrun
c26abfa541 Rename ABS macro to FFABS. 
Originally committed as revision 6666 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-11 23:17:58 +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
Måns Rullgård
b86216de4c dc_val should be signed 
Originally committed as revision 6364 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-27 22:13:44 +00:00
Måns Rullgård
191e8ca752 fix some signedness warnings 
Originally committed as revision 6355 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-27 19:47:39 +00:00
Diego Biurrun
5509bffa88 Update licensing information: The FSF changed postal address. 
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-12 22:43:26 +00:00
Diego Biurrun
bb270c0896 COSMETICS: tabs --> spaces, some prettyprinting 
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-22 01:10:11 +00:00