generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
29,763 Commits 24 Branches 241 Tags 173 MiB
002e1f1eb3
Commit Graph

268 Commits

Author SHA1 Message Date
Stefano Sabatini
ce5e49b0c2 replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_* 2011-05-02 16:41:41 +02:00
Michael Niedermayer
be315a3232 Merge remote branch 'qatar/master' 
* qatar/master:
Duplicate  AMV: disable DR1 and don't override EMU_EDGE
Duplicate  lavf: inspect more frames for fps when container time base is coarse
Wrong and we have correct fix: Fix races in default av_log handler
  vorbis: Replace sized int_fast integer types with plain int/unsigned.
  Remove disabled non-optimized code variants.
NO  bswap.h: Remove disabled code.
  Remove some disabled printf debug cruft.
  Replace more disabled printf() calls by av_dlog().
NO  tests: Remove disabled code.
NO  Replace some commented-out debug printf() / av_log() messages with av_dlog().
  vorbisdec: Replace some sizeof(type) by sizeof(*variable).
NO  vf_fieldorder: Replace FFmpeg by Libav in license boilerplate.

Conflicts:
	libavcodec/h264.c
	libavcodec/vorbisdec.c
	libavutil/log.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-30 01:58:26 +02:00
Diego Biurrun
2e15305b70 Remove some disabled printf debug cruft. 2011-04-29 20:00:53 +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
Anton Khirnov
e7021c0ed5 lavc: remove FF_API_HURRY_UP cruft 2011-04-26 08:16:05 +02:00
Michael Niedermayer
f35439699f Merge remote branch 'qatar/master' 
* qatar/master:
  Fixed-point MDCT with 32-bit unscaled output
  lavc: deprecate rate_emu
  lavc: mark hurry_up for removal on next major bump
  parser: mark av_parser_parse() for removal on next major bump
  lavc: add missing audioconvert includes
  jvdec: don't use deprecated CODEC_TYPE_*/PKT_FLAG_KEY

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-03 02:28:01 +02:00
Anton Khirnov
8ed2ae09a2 lavc: mark hurry_up for removal on next major bump 
It has been deprecated for about five years, skip_idct/skip_frame should
be used instead.
 2011-04-02 16:17:24 +02:00
Michael Niedermayer
d375c10400 Fake-Merge remote-tracking branch 'ffmpeg-mt/master' 2011-03-22 22:36:57 +01: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
Michael Niedermayer
3088635a44 h263dec: produce a warning when excessive bitstream is discarded 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-03 18:22:27 +01:00
Michael Niedermayer
1b4580d1a2 Fix duplicate & droped frame in Californication.S02E01.HDTV.XviD-NoTV.avi 2011-03-03 03:37:44 +01:00
Diego Elio Pettenò
e7e2df27f8 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf. 
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d36beb3f69)
 2011-01-28 03:15:34 +01:00
Diego Elio Pettenò
d36beb3f69 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf. 
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-26 16:08:45 +00:00
Michael Niedermayer
df59c9c0f8 Detect incorrect padding with wrong stuffing codes used by NEC N-02B. 
I dont know if this is the best way to handle it. But it fixes http://kuwatan.jp/temp/n-02b.3gp

Fixes issue 2373.

Originally committed as revision 25875 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-04 05:44:18 +00:00
Stefano Sabatini
c6c98d0897 Move mm_support() from libavcodec to libavutil, make it a public 
function and rename it to av_get_cpu_flags().

Originally committed as revision 25076 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-08 15:07:14 +00:00
Stefano Sabatini
7160bb716b Rename FF_MM_ symbols related to CPU features flags as AV_CPU_FLAG_ 
symbols, and move them from libavcodec/avcodec.h to libavutil/cpu.h.

Originally committed as revision 25040 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-04 09:59:08 +00:00
Måns Rullgård
c0ec9918b0 Remove global mm_flags variable 
Originally committed as revision 24909 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-24 17:47:05 +00:00
Carl Eugen Hoyos
0fd0ef7947 Add new decoder property max_lowres and do not init decoder if requested value is higher. 
Originally committed as revision 24098 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-07 21:23:36 +00:00
Michael Niedermayer
d3752b15d8 Treat SIPP like xvid, fixed issue1966 
Originally committed as revision 23336 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-26 17:23:36 +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
Stefano Sabatini
72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which 
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-30 23:30:55 +00:00
Carl Eugen Hoyos
bf9d70d5e4 Pass correct buffer-pointer and buffer-size to hardware accelerated 
decoders when decoding packed B-frames.

Originally committed as revision 22149 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-02 17:12:41 +00:00
Carl Eugen Hoyos
8ef4f92b0d Process packed bitstream also for VDPAU. 
Originally committed as revision 22131 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-01 16:52:35 +00:00
Michael Niedermayer
b317567cf4 Change xvid/divx/lavc build variables to be consistent to x264_build. 
Originally committed as revision 21682 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-08 00:43:15 +00:00
Michael Niedermayer
fc53b6afee Split H263 encoder and decoder from common code. 
Originally committed as revision 21109 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-09 14:59:06 +00:00
Michael Niedermayer
261a3c2d05 Move AVCodecs from h263dec.c to msmpeg4.c and disentangle init decode init. 
Originally committed as revision 21102 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-08 19:40:10 +00:00
Michael Niedermayer
7213abf6ba Use h263 tables in msmpeg4v1 dont duplicate them halfway. 
Originally committed as revision 21101 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-08 19:10:11 +00:00
Michael Niedermayer
51ce2207c8 Add a few CONFIG_MPEG4_DECODER that should be there. 
Originally committed as revision 21082 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-08 04:00:06 +00:00
Michael Niedermayer
ca334dd14b Split the mpeg4 encoder and decoder off h263.c 
Originally committed as revision 21079 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 23:53:49 +00:00
Michael Niedermayer
0b60f3bdf5 2 more if(CONFIG_*_DECODER) 
Originally committed as revision 21055 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 06:32:34 +00:00
Michael Niedermayer
d7525cba23 Split out intel H263 decoder. 
Originally committed as revision 21054 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 06:25:41 +00:00
Michael Niedermayer
a0b0d75368 Split flv decoding out. 
Originally committed as revision 21051 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 05:36:45 +00:00
Michael Niedermayer
24b207b5a5 Adjust threshold for xvid packed b frame detection. 
Also add xvid_build check.
If you note any packed bitstream regression, check this commit first and report it.
Fixes issue1652

Originally committed as revision 20997 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-01 21:32:48 +00:00
Michael Niedermayer
6c58758737 It appears s->bitstream_buffer_size has to be 0 at the end so rather use assert. 
Originally committed as revision 20996 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-01 21:07:52 +00:00
Ronald S. Bultje
6e44ba1550 Use get_bits_left() instead of size_in_bits - get_bits_count(). 
Originally committed as revision 20543 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-16 17:42:43 +00:00
NVIDIA Corporation
70e0c871eb Add VDPAU hardware accelerated decoding for MPEG-4 ASP which can be used 
by video players.

Original patch by NVIDIA corporation.

Originally committed as revision 20502 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-10 18:52:39 +00:00
Stefano Sabatini
b0bef34209 Add additional long names for the Flash Video decoder and encoder. 
Originally committed as revision 20317 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-19 18:45:44 +00:00
Diego Biurrun
7881793dd0 Remove unused debug av_log() calls. 
Originally committed as revision 19549 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-30 20:57:41 +00:00
Baptiste Coudurier
87e302bfd8 remove unused hack which set AVCodecContext frame_number to pic timestamp 
Originally committed as revision 18988 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-30 00:24:20 +00:00
David Conrad
580a7465fb Add a chroma_sample_location field to define positioning of chroma samples 
Originally committed as revision 18795 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-11 04:34:23 +00:00
Reimar Döffinger
238ef6dadd Add a av_fast_malloc function and replace several uses of av_fast_realloc, 
thus avoiding potential memleaks and pointless memcpys.

Originally committed as revision 18470 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-12 13:17:37 +00:00
Thilo Borgmann
7a00bbad21 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an 
AVPacket argument rather than a const uint8_t *buf + int buf_size. This allows
passing of packet-specific flags from demuxer to decoder, such as the keyframe
flag, which appears necessary to playback corePNG P-frames.

Patch by Thilo Borgmann thilo.borgmann googlemail com, see also the thread
"Google Summer of Code participation" on the mailinglist.

Originally committed as revision 18351 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-07 15:59:50 +00:00
Diego Biurrun
0ffbc258aa Change a bunch of codec long_names to be more consistent and descriptive. 
Originally committed as revision 17716 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-02 05:18:33 +00:00
Gwenole Beauchesne
a4f3fdfa83 Use ff_hwaccel_pixfmt_list_420[] in H.263 decoder. 
Patch by Gwenolé Beauchesne.

Originally committed as revision 17645 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-27 15:49:32 +00:00
Gwenole Beauchesne
1468d503a9 Add HW acceleration hooks for MPEG-4 / H.263 decoding. 
Patch by Gwenole Beauchesne.

Originally committed as revision 17637 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-27 08:27:50 +00:00
Michael Niedermayer
a05aa821b6 add ff_find_hwaccel() by Gwenole Beauchesne 
Originally committed as revision 17569 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-24 19:04:43 +00:00
Michael Niedermayer
f986c8e2e5 Another AVhwaccel hunk from Gwenole Beauchesne. 
Originally committed as revision 17565 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-24 18:39:42 +00:00
Michael Niedermayer
09a9b45e4f Add and use ff_pixfmt_list_420. 
Originally committed as revision 17564 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-24 18:27:52 +00:00
Gwenole Beauchesne
c0aec489a6 Approved hunk from the AVHWaccel patch by Gwenole Beauchesne. 
Originally committed as revision 17563 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-24 18:24:56 +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