virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
47,418 Commits 37 Branches 400 Tags 465 MiB
3313e46c4a
Commit Graph

81 Commits

Author SHA1 Message Date
Michael Niedermayer
ac627b3d38 Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 
* commit '716d413c13981da15323c7a3821860536eefdbbb':
  Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat

Conflicts:
	doc/examples/muxing.c
	ffmpeg.h
	ffmpeg_filter.c
	ffmpeg_opt.c
	ffplay.c
	ffprobe.c
	libavcodec/8bps.c
	libavcodec/aasc.c
	libavcodec/aura.c
	libavcodec/avcodec.h
	libavcodec/avs.c
	libavcodec/bfi.c
	libavcodec/bmp.c
	libavcodec/bmpenc.c
	libavcodec/c93.c
	libavcodec/cscd.c
	libavcodec/cyuv.c
	libavcodec/dpx.c
	libavcodec/dpxenc.c
	libavcodec/eatgv.c
	libavcodec/escape124.c
	libavcodec/ffv1.c
	libavcodec/flashsv.c
	libavcodec/fraps.c
	libavcodec/h264.c
	libavcodec/huffyuv.c
	libavcodec/iff.c
	libavcodec/imgconvert.c
	libavcodec/indeo3.c
	libavcodec/kmvc.c
	libavcodec/libopenjpegdec.c
	libavcodec/libopenjpegenc.c
	libavcodec/libx264.c
	libavcodec/ljpegenc.c
	libavcodec/mjpegdec.c
	libavcodec/mjpegenc.c
	libavcodec/motionpixels.c
	libavcodec/mpeg12.c
	libavcodec/mpeg12enc.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pamenc.c
	libavcodec/pcxenc.c
	libavcodec/pgssubdec.c
	libavcodec/pngdec.c
	libavcodec/pngenc.c
	libavcodec/pnm.c
	libavcodec/pnmdec.c
	libavcodec/pnmenc.c
	libavcodec/ptx.c
	libavcodec/qdrw.c
	libavcodec/qpeg.c
	libavcodec/qtrleenc.c
	libavcodec/raw.c
	libavcodec/rawdec.c
	libavcodec/rl2.c
	libavcodec/sgidec.c
	libavcodec/sgienc.c
	libavcodec/snowdec.c
	libavcodec/snowenc.c
	libavcodec/sunrast.c
	libavcodec/targa.c
	libavcodec/targaenc.c
	libavcodec/tiff.c
	libavcodec/tiffenc.c
	libavcodec/tmv.c
	libavcodec/truemotion2.c
	libavcodec/utils.c
	libavcodec/vb.c
	libavcodec/vp3.c
	libavcodec/wnv1.c
	libavcodec/xl.c
	libavcodec/xwddec.c
	libavcodec/xwdenc.c
	libavcodec/yop.c
	libavdevice/v4l2.c
	libavdevice/x11grab.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/buffersrc.c
	libavfilter/drawutils.c
	libavfilter/formats.c
	libavfilter/src_movie.c
	libavfilter/vf_ass.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_format.c
	libavfilter/vf_hflip.c
	libavfilter/vf_lut.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c
	libavfilter/vf_scale.c
	libavfilter/vf_transpose.c
	libavfilter/vf_yadif.c
	libavfilter/video.c
	libavfilter/vsrc_testsrc.c
	libavformat/movenc.c
	libavformat/mxf.h
	libavformat/utils.c
	libavformat/yuv4mpeg.c
	libavutil/imgutils.c
	libavutil/pixdesc.c
	libswscale/input.c
	libswscale/output.c
	libswscale/swscale_internal.h
	libswscale/swscale_unscaled.c
	libswscale/utils.c
	libswscale/x86/swscale_template.c
	libswscale/x86/yuv2rgb.c
	libswscale/x86/yuv2rgb_template.c
	libswscale/yuv2rgb.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-08 21:06:57 +02:00
Anton Khirnov
716d413c13 Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat 2012-10-08 07:13:26 +02:00
Michael Niedermayer
17106a7c90 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  audio_frame_queue: Clean up ff_af_queue_log_state debug function
  dwt: Remove unused code.
  cavs: convert cavsdata.h to a .c file
  cavs: Move inline functions only used in one file out of the header
  cavs: Move data tables used in only one place to that file
  fate: Add a single symbol Ut Video decoder test
  vf_hqdn3d: x86 asm
  vf_hqdn3d: support 16bit colordepth
  avconv: prefer user-forced input framerate when choosing output framerate

Conflicts:
	ffmpeg.c
	libavcodec/audio_frame_queue.c
	libavcodec/dwt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-26 22:40:02 +02:00
Mans Rullgard
88386feefd cavs: convert cavsdata.h to a .c file 
Defining tables in header files is ugly and prone to duplication.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-08-26 14:03:56 +02:00
Diego Biurrun
a6d9f9e60e cavs: Move inline functions only used in one file out of the header 2012-08-26 14:03:56 +02:00
Diego Biurrun
ef07ac1e12 cavs: Move data tables used in only one place to that file 2012-08-26 14:03:55 +02:00
Michael Niedermayer
e40f7f1e01 cavs: fix memleak 
Fixes Ticket1335

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-08 01:14:18 +02:00
Michael Niedermayer
2f7bd3b516 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  apedec: check bits <= 32.
  cavs: Remove unused code.
  oggenc: fix condition when not to flush due to keyframe granule.
  oggenc: add pagesize option to set preferred page size
  libspeexdec: set frame size in libspeex_decode_init()
  smacker audio: sign-extend the initial 16-bit predicted value

Conflicts:
	libavcodec/apedec.c
	libavcodec/libspeexdec.c
	libavformat/oggenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-01 00:36:43 +02:00
Aneesh Dogra
c265b77b11 cavs: Remove unused code. 
The square is always passed as 1 whenever the function is called and
thus the if block never gets executed.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2012-03-31 08:14:54 -07:00
Michael Niedermayer
280beebd39 cavsdec: initialize all tables to zeros. 
This ensures that they dont contain invalid values.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-30 21:48:17 +02:00
Michael Niedermayer
6cb2085278 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (27 commits)
  ppc: Add ff_ prefix to nonstatic symbols
  sh4: Add ff_ prefix to nonstatic symbols
  mpegvideo: Add ff_ prefix to nonstatic functions
  rtjpeg: Add ff_ prefix to nonstatic symbols
  rv: Add ff_ prefix to nonstatic symbols
  vp56: Add ff_ prefix to nonstatic symbols
  vorbis: Add ff_ prefix to nonstatic symbols
  msmpeg4: Add ff_ prefix to nonstatic symbols
  vc1: Add ff_ prefix to nonstatic symbols
  msmpeg4: Add ff_ prefixes to nonstatic symbols
  snow: Add ff_ prefix to nonstatic symbols
  mpeg12: Add ff_ prefix to nonstatic symbols
  mpeg4: Add ff_ prefixes to nonstatic symbols
  lagarith: Add ff_ prefix to lag_rac_init
  libavcodec: Add ff_ prefix to j_rev_dct*
  dsputil: Add ff_ prefix to inv_zigzag_direct16
  libavcodec: Prefix fdct_ifast, fdct_ifast248
  dsputil: Add ff_ prefix to the dsputil*_init* functions
  libavcodec: Add ff_ prefix to some nonstatic symbols
  vlc/rl: Add ff_ prefix to the nonstatic symbols
  ...

Conflicts:
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/dnxhddec.c
	libavcodec/ffv1.c
	libavcodec/h263.h
	libavcodec/h263dec.c
	libavcodec/h264.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/nuv.c
	libavcodec/ppc/dsputil_ppc.c
	libavcodec/proresdsp.c
	libavcodec/svq3.c
	libavcodec/version.h
	libavformat/dv.h
	libavformat/dvenc.c
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-16 01:34:37 +01:00
Martin Storsjö
efd29844eb mpegvideo: Add ff_ prefix to nonstatic functions 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-15 22:07:23 +02:00
Michael Niedermayer
757473831c Merge remote-tracking branch 'qatar/master' 
* qatar/master: (29 commits)
  cabac: Move code only used within the CABAC test program into the test program.
  vp56: Drop unnecessary cabac.h #include.
  h264-test: Initialize AVCodecContext.av_class.
  build: Skip compiling network.h and rtsp.h if networking is not enabled.
  cosmetics: drop some pointless parentheses
  Disable annoying warning without changing behavior
  faq: Solutions for common problems with sample paths when running FATE.
  avcodec: attempt to clarify the CODEC_CAP_DELAY documentation
  avcodec: fix avcodec_encode_audio() documentation.
  FATE: xmv-demux test; exercise the XMV demuxer without decoding the perceptual codecs inside.
  vqf: recognize more metadata chunks
  FATE test: BMV demuxer and associated video and audio decoders.
  FATE: indeo4 video decoder test.
  FATE: update xxan-wc4 test to a sample with more code coverage.
  Change the recent h264_mp4toannexb bitstream filter test to output to an elementary stream rather than a program stream.
  g722enc: validate AVCodecContext.trellis
  g722enc: set frame_size, and also handle an odd number of input samples
  g722enc: split encoding into separate functions for trellis vs. no trellis
  mpegaudiodec: Use clearer pointer math
  tta: Fix returned error code at EOF
  ...

Conflicts:
	libavcodec/h264.c
	libavcodec/indeo3.c
	libavcodec/interplayvideo.c
	libavcodec/ivi_common.c
	libavcodec/libxvidff.c
	libavcodec/mpegvideo.c
	libavcodec/ppc/mpegvideo_altivec.c
	libavcodec/tta.c
	libavcodec/utils.c
	libavfilter/vsrc_buffer.c
	libavformat/Makefile
	tests/fate/indeo.mak
	tests/ref/acodec/g722

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-08 03:34:22 +01:00
Diego Biurrun
3dc99a18d4 cosmetics: drop some pointless parentheses 2012-01-07 22:13:07 +01:00
Michael Niedermayer
e10979ff56 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  changelog: misc typo and wording fixes
  H.264: add filter_mb_fast support for >8-bit decoding
  doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support.
  lls: use av_lfg instead of rand() in test program
  build: remove unnecessary dependency on libs from 'all' target
  H.264: avoid redundant alpha/beta calculations in loopfilter
  H.264: optimize intra/inter loopfilter decision
  mpegts: fix Continuity Counter error detection
  build: remove unnecessary FFLDFLAGS variable
  vp8/mt: flush worker thread, not application thread context, on seek.
  mt: proper locking around release_buffer calls.
  DxVA2: unbreak build after [657ccb5ac7]
  hwaccel: unbreak build
  Eliminate FF_COMMON_FRAME macro.

Conflicts:
	Changelog
	Makefile
	doc/developer.texi
	libavcodec/avcodec.h
	libavcodec/h264.c
	libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-12 01:42:32 +02:00
Diego Biurrun
657ccb5ac7 Eliminate FF_COMMON_FRAME macro. 
FF_COMMON_FRAME holds the contents of the AVFrame structure and is also copied
to struct Picture.  Replace by an embedded AVFrame structure in struct Picture.
 2011-07-11 00:19:00 +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
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
Måns Rullgård
f079a64aea Move cavs dsp functions to their own struct 
Originally committed as revision 24685 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-03 20:59:00 +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
Benoit Fouet
32e543f866 Replace @returns by @return. 
Originally committed as revision 22729 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-30 15:50:57 +00:00
Stefan Gehrer
026b9d3c5a avoid using DECLARE_ALIGNED on stack variable as suggested by Reimar 
Originally committed as revision 21835 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-15 16:37:13 +00:00
Måns Rullgård
c67278098d Move array specifiers outside DECLARE_ALIGNED() invocations 
Originally committed as revision 21377 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-22 03:25:11 +00:00
Stefano Sabatini
9106a698e7 Rename bitstream.h to get_bits.h. 
Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-13 16:20:26 +00:00
Stefan Gehrer
6847ab4375 introduce a macroblock index to avoid a few x*width+y calculations 
Originally committed as revision 17138 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-10 22:38:02 +00:00
Stefan Gehrer
b9fce05205 fix multiple slices per frame 
Originally committed as revision 17137 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-10 20:51:35 +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
199436b952 moves mid_pred() into mathops.h (with arch specific code split by directory) 
Originally committed as revision 16681 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-18 22:57:40 +00:00
Stefan Gehrer
bef01ca08f rename XXX_t enums to cavs_XXX to fix POSIX namespace issue 
Originally committed as revision 16642 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-16 17:45:54 +00:00
Stefan Gehrer
e685e8eada rename vector_t to cavs_vector 
Originally committed as revision 16641 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-16 17:20:17 +00:00
Zuxy Meng
98a6fff98c Apply 'cold' attribute to init/uninit functions in libavcodec 
Originally committed as revision 12525 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-21 03:11:20 +00:00
Roman Shaposhnik
905694d96e * renaming (ST|LD)(16|32|64) -> AV_(R|W)N(16|32|64) 
Originally committed as revision 10023 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-09 17:01:15 +00:00
Roman Shaposhnik
f49f6e8889 replacing the use of deprecated unaligned*() routines by LD64 and AV_RB32 
Originally committed as revision 9834 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-30 18:05:46 +00:00
Stefan Gehrer
5d2b15b870 have less functions as inline 
Originally committed as revision 9792 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-25 05:09:54 +00:00
Stefan Gehrer
844d9012a6 split decoder-specific parts into their own file 
Originally committed as revision 9533 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-08 07:37:30 +00:00
Stefan Gehrer
1503063f83 prepare splitting decoder-only parts into own file: 
make commonly used tables global

Originally committed as revision 9532 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-08 07:13:25 +00:00
Stefan Gehrer
ceb48b46f8 prepare splitting decoder-only parts into own file: 
make commonly used functions global

Originally committed as revision 9519 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-07 07:35:18 +00:00
Stefan Gehrer
218b3ae970 move dequantization into its own inline function 
Originally committed as revision 9518 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-07 07:14:58 +00:00
Stefan Gehrer
ce7088b9a8 cosmetic: rename VLC tables to make clear they 
are for decoding

Originally committed as revision 9517 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-07 06:49:20 +00:00
Stefan Gehrer
07caa46e99 setting special motion vectors in intra macroblocks 
is now in its own inline function

Originally committed as revision 9516 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-07 06:34:30 +00:00
Stefan Gehrer
8a35c8e71a setting intra prediction modes to default values 
in inter macroblocks is now in its own inline
function

Originally committed as revision 9515 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-07 06:27:44 +00:00
Stefan Gehrer
25c899471d move modification of intra prediction modes into 
its own inline function

Originally committed as revision 9514 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-07 06:15:05 +00:00
Stefan Gehrer
e183b6d17c move preparation of chroma intra prediction into its 
own inline function

Originally committed as revision 9513 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-07 05:27:59 +00:00
Stefan Gehrer
b8524fd13f move existing inline functions from cavs.c to cavs.h 
Originally committed as revision 9512 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-07 05:03:22 +00:00
Stefan Gehrer
2a3cc9730f move context structure definition from cavs.c to cavs.h 
Originally committed as revision 9511 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-07 04:58:54 +00:00
Stefan Gehrer
ac83e7b235 make vector constants global 
Originally committed as revision 9510 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-07 04:54:05 +00:00
Diego Biurrun
e5a389a1b7 license header consistency cosmetics 
Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-05 10:40:25 +00:00
Aurelien Jacobs
c5a60225c7 move cavs parser in it's own file 
Originally committed as revision 8945 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-09 00:03:17 +00:00
Aurelien Jacobs
b88e211426 move defines and enums out of cavsdata.h 
Originally committed as revision 8944 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-08 23:58:35 +00:00