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
44,432 Commits 37 Branches 400 Tags 465 MiB
75f3e0ad95
Commit Graph

18 Commits

Author SHA1 Message Date
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ö
6f13a371ec mpeg4: Add ff_ prefixes to nonstatic symbols 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-15 22:06:52 +02:00
Michael Niedermayer
c9cab022a3 mpeg4dec: restore error concealment functionality after merge 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-13 01:26:14 +01:00
Michael Niedermayer
8bc7fe4daf Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doxygen: misc consistency, spelling and wording fixes
  vcr1: drop unnecessary emms_c() calls without MMX code
  Replace all uses of av_close_input_file() with avformat_close_input().
  lavf: add avformat_close_input().
  lavf: deprecate av_close_input_stream().
  lavf doxy: add some basic demuxing documentation.
  lavf doxy: add some general lavf information.
  lavf doxy: add misc utility functions to a group.
  lavf doxy: add av_guess_codec/format to the encoding group.
  lavf doxy: add core functions to a doxy group.
  Add basic libavdevice documentation.
  lavc: convert error_recognition to err_recognition.
  avconv: update -map option help text
  x86: Require 7 registers for the cabac asm
  x86: bswap: remove test for bswap instruction
  bswap: make generic implementation more compiler-friendly
  h264: remove useless cast
  proresdec: fix decode_slice() prototype

Conflicts:
	configure
	doc/APIchanges
	ffprobe.c
	libavcodec/avcodec.h
	libavcodec/celp_math.h
	libavcodec/h264.c
	libavfilter/src_movie.c
	libavformat/anm.c
	libavformat/avformat.h
	libavformat/version.h
	libavutil/avstring.h
	libavutil/bswap.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-13 00:39:48 +01:00
Diego Biurrun
58c42af722 doxygen: misc consistency, spelling and wording fixes 2011-12-12 23:06:23 +01:00
Dustin Brody
5b22d6e132 lavc: convert error_recognition to err_recognition. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-12-12 19:42:50 +01:00
Michael Niedermayer
bf8bb94322 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  ffmpeg: get rid of the -vglobal option.
  dct32: Add AVX implementation of 32-point DCT
  dct32: Change pass 6 permutation to allow for AVX implementation
  dct32: port SSE 32-point DCT to YASM
  multiple inclusion guard cleanup
  avio: document buffer must created with av_malloc() and friends
  avio: check AVIOContext malloc failure
  swscale: point out an alternative to sws_getContext
  svq3: Do initialization after parsing the extradata
  add changelog entries for 0.7_beta2
  mp3lame: add #include required for AV_RB32 macro.

Conflicts:
	Changelog
	libavcodec/svq3.c
	libavcodec/x86/dct32_sse.c
	libavfilter/vsrc_buffer.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-22 04:53:19 +02:00
Diego Biurrun
153382e1b6 multiple inclusion guard cleanup 
Add missing multiple inclusion guards; clean up #endif comments;
add missing library prefixes; keep guard names consistent.
 2011-05-21 13:48:10 +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 Elio Pettenò
6a495e986f Make inter_rvlc and intra_rvlc static tables. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 84ae8936f6)
 2011-02-06 20:31:47 +01:00
Diego Elio Pettenò
84ae8936f6 Make inter_rvlc and intra_rvlc static tables. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-06 09:53:33 -05:00
Måns Rullgård
9c9a0840d0 Add lots of missing includes 
Originally committed as revision 22337 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 18:43:52 +00:00
Michael Niedermayer
0366b6e199 Make some tables static again, i mistakely thought they would be used in several 
places.

Originally committed as revision 21111 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-09 17:22:37 +00:00
Michael Niedermayer
a7ac9c2f62 Move 3 direct MV related functions that i left out from h263.c to mpeg4video.c. 
Originally committed as revision 21104 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-08 19:59:51 +00:00
Michael Niedermayer
fef59a5b4b Rename mpeg4 intra vlc tables so they contain "mpeg4", this improves readability 
of msmpeg4 code (one now knows where that table comes from).

Originally committed as revision 21097 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-08 17:41:14 +00:00
Michael Niedermayer
05b858b045 Rename DCtab_*, its a global variable and it helps understanding if mpeg4 
is in its name.

Originally committed as revision 21096 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-08 17:28:43 +00:00
Michael Niedermayer
28fbbee15f Remove useless line. 
Originally committed as revision 21092 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-08 16:26:44 +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