generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
31,204 Commits 24 Branches 241 Tags 173 MiB
889639969b
Commit Graph

262 Commits

Author SHA1 Message Date
Michael Niedermayer
976a8b2179 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (40 commits)
  H.264: template left MB handling
  H.264: faster fill_decode_caches
  H.264: faster write_back_*
  H.264: faster fill_filter_caches
  H.264: make filter_mb_fast support the case of unavailable top mb
  Do not include log.h in avutil.h
  Do not include pixfmt.h in avutil.h
  Do not include rational.h in avutil.h
  Do not include mathematics.h in avutil.h
  Do not include intfloat_readwrite.h in avutil.h
  Remove return statements following infinite loops without break
  RTSP: Doxygen comment cleanup
  doxygen: Escape '\' in Doxygen documentation.
  md5: cosmetics
  md5: use AV_WL32 to write result
  md5: add fate test
  md5: include correct headers
  md5: fix test program
  doxygen: Drop array size declarations from Doxygen parameter names.
  doxygen: Fix parameter names to match the function prototypes.
  ...

Conflicts:
	libavcodec/x86/dsputil_mmx.c
	libavformat/flvenc.c
	libavformat/oggenc.c
	libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-04 00:45:21 +02:00
Mans Rullgard
0ebcdf5cda Do not include mathematics.h in avutil.h 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-03 21:42:06 +01:00
Diego Biurrun
050f509065 snow: Remove unused code. 2011-07-03 18:30:01 +02:00
Michael Niedermayer
c137fdd778 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  swscale: remove misplaced comment.
  ffmpeg: fix streaming to ffserver.
  swscale: split out RGB48 output functions from yuv2packed[12X]_c().
  build: move vpath directives to main Makefile
  swscale: fix JPEG-range YUV scaling artifacts.
  build: move ALLFFLIBS to a more logical place
  ARM: factor some repetitive code into macros
  Fix SVQ3 after adding 4:4:4 H.264 support
  H.264: fix CODEC_FLAG_GRAY
  4:4:4 H.264 decoding support
  ac3enc: fix allocation of floating point samples.

Conflicts:
	ffmpeg.c
	libavcodec/dsputil_template.c
	libavcodec/h264.c
	libavcodec/mpegvideo.c
	libavcodec/snow.c
	libswscale/swscale.c
	libswscale/swscale_internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-15 02:15:25 +02:00
Jason Garrett-Glaser
c90b94424c 4:4:4 H.264 decoding support 
Note: this is 4:4:4 from the 2007 spec revision, not the previous (now deprecated) 4:4:4 mode in H.264.
 2011-06-13 21:16:30 -07:00
Jason Garrett-Glaser
504811baea Roll back 4:4:4 H.264 for now 
Needs some ARM/PPC asm modifications.
 2011-06-13 13:38:46 -07:00
Jason Garrett-Glaser
c9c493872c 4:4:4 H.264 decoding support 
Note: this is 4:4:4 from the 2007 spec revision, not the previous (now deprecated) 4:4:4 mode in H.264.
 2011-06-13 12:21:39 -07:00
Stefano Sabatini
ce5e49b0c2 replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_* 2011-05-02 16:41:41 +02:00
Stefano Sabatini
975a1447f7 Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*. 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-05-02 12:18:44 +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
Alexander Strange
1500be13f2 dsputil: allow to skip drawing of top/bottom edges. 2011-03-26 17:45:38 -04: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
Ronald S. Bultje
d23e3e5fea Move ff_emulated_edge_mc() into DSPContext. 
(cherry picked from commit 2e27959879)
 2011-01-30 03:41:01 +01:00
Ronald S. Bultje
2e27959879 Move ff_emulated_edge_mc() into DSPContext. 2011-01-28 22:13:26 -05: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
Måns Rullgård
5262f7ed1d snow: remove unused parameter to mc_block() 
Originally committed as revision 23746 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-23 23:44:48 +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
Måns Rullgård
33996217ca Add ff_ prefix to dwt functions 
Originally committed as revision 22523 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-14 17:50:16 +00:00
Måns Rullgård
05aec7bb87 Separate DWT from snow and dsputil 
This moves the DWT functions from snow.c and dsputil.c to a file of
their own.  A new struct, DWTContext, holds the function pointers
previously part of DSPContext.

Originally committed as revision 22522 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-14 17:50:12 +00:00
Måns Rullgård
94ca624fbc Move ff_sqrt() to libavutil/intmath.h 
Originally committed as revision 22345 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 21:19:56 +00:00
Måns Rullgård
c26e58e32c Add some missing #includes 
Originally committed as revision 22258 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-06 22:36:36 +00:00
Michael Niedermayer
2c8077621b Optimize ff_snow_horizontal_compose97i. 
this makes the 9/7 C wavelet at the decoder side 22% faster.
The old code is changed to match the new in terms of the order of operations
(which also makes it sligtly faster)

Originally committed as revision 21132 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-11 02:52:50 +00:00
Michael Niedermayer
233a8b3d6b Merge vertical_compose53iL0*() 
8% faster C 5/3 wavelet at the decoder side.

Originally committed as revision 21131 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-11 01:00:50 +00:00
Michael Niedermayer
2a84512a74 Optimize horizontal_compose53i() by inlining inv_lift() and optimizing the 
resulting code slightly. ~30% faster C 5/3 wavelet at the decoder side.

Originally committed as revision 21130 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-11 00:54:48 +00:00
Jai Menon
4536c8e603 Snow : re-indent after r21093. 
Originally committed as revision 21094 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-08 16:37:32 +00:00
Jai Menon
a4bd598541 Snow : remove pointless 'if(1)'. 
Originally committed as revision 21093 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-08 16:34:50 +00:00
Jai Menon
2da16f288a Snow : use non-NULL context for av_log. 
Originally committed as revision 21089 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-08 14:45:24 +00:00
Jai Menon
8ec5a042e4 Cosmetics : remove duplicated comment. 
Originally committed as revision 21088 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-08 14:33:35 +00:00
Jai Menon
e8c6411ce3 Snow : release buffers allocated using avctx->get_buffer. 
Originally committed as revision 21084 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-08 05:09:17 +00:00
Michael Niedermayer
c267bb038e Fix 1 pass RC in snow. 
Fixes issue547.

Originally committed as revision 20706 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-02 20:07:23 +00:00
Diego Biurrun
d773d85515 Reorder functions so that encoding functions are disabled by the preprocessor. 
Fixes compilation with disabled optimizations and enabled Snow decoder.

Originally committed as revision 19914 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-18 19:45:09 +00:00
Baptiste Coudurier
2b2b7f41de snow decoder uses get_buffer, set CODEC_CAP_DR1 
Originally committed as revision 19104 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-05 08:40:31 +00:00
Michael Niedermayer
9a3eaeebad Correct x/ymin to avoid segfault due to out of picture reads. 
Originally committed as revision 18771 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-08 15:14:36 +00:00
Michael Niedermayer
3788e661f1 Optimize sign handling in get_symbol(). 
Originally committed as revision 18672 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-24 00:26:49 +00:00
Michael Niedermayer
e1b3d27272 Remove 2 useless FFMIN(). 
Originally committed as revision 18664 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-22 22:05:34 +00:00
Michael Niedermayer
7bdf2eb8c4 Remove apparently redundant code. 
Originally committed as revision 18663 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-22 21:44:41 +00:00
Lars Täuber
a4873f7d9d Fix indention, patch by Lars Täuber. 
Originally committed as revision 18594 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 19:29:54 +00:00
Michael Niedermayer
29322398fc Remove unused variable from slice_buffer_release() found by CSA. 
Originally committed as revision 18570 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 17:39:09 +00:00
Michael Niedermayer
75eaa91c15 Remove unused variables from slice_buffer_load_line() found by CSA. 
Originally committed as revision 18561 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 15:01:58 +00:00
Diego Biurrun
64bde1974b cosmetics: Rename prn variable to prng (Pseudo Random Number Generator). 
Originally committed as revision 18422 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-10 17:23:38 +00:00
Michael Niedermayer
cc0241283b Make sure the next used frame is released so get_buffer() wont fail. 
Originally committed as revision 18399 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-09 21:19:25 +00:00
Michael Niedermayer
38fd076c21 Move release_buffer() up so it is prior to a future call to it. 
Originally committed as revision 18398 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-09 21:17:53 +00:00
Michael Niedermayer
0a08b5735b Factorize release_buffer() 
Originally committed as revision 18397 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-09 20:44:18 +00:00
Michael Niedermayer
eebbb33abf Make sure spatial_decomposition_count is not too large for picture size. 
this led to an infinite loop in mirror().

Originally committed as revision 18396 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-09 20:23:13 +00:00
Michael Niedermayer
69409ccb80 Skip non intra frames that have no reference frames. 
Originally committed as revision 18395 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-09 20:13:35 +00:00
Michael Niedermayer
440882f7be Make sure spatial_decomposition_count is >0. 
Originally committed as revision 18394 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-09 19:45:10 +00:00
Michael Niedermayer
dc7f45a08e Make sure the block array is of the correct size. 
This might have been exploitable.

Originally committed as revision 18393 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-09 18:47:50 +00:00