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
76,034 Commits 37 Branches 400 Tags 465 MiB
1a29804558
Commit Graph

45 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
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
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
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
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
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
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
Stefano Sabatini
987903826b Globally rename the header inclusion guard names. 
Consistently apply this rule: the guard name is obtained from the
filename by stripping the leading "lib", converting '/' and '.'  to
'_' and uppercasing the resulting name. Guard names in the root
directory have to be prefixed by "FFMPEG_".

Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-31 07:39:47 +00:00
Diego Biurrun
5b21bdabe4 Add FFMPEG_ prefix to all multiple inclusion guards. 
Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-17 09:37:46 +00:00
Guillaume Poirier
efb775777f add a comment to indicate which #endif belong to which #define 
Originally committed as revision 9356 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-17 18:59:28 +00:00
Måns Rullgård
699b3f99d0 add multiple inclusion guards to headers 
Originally committed as revision 9345 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-17 00:01:30 +00:00
Måns Rullgård
99545457bf include all prerequisites in header files 
Originally committed as revision 9344 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-16 22:59:13 +00:00
Diego Biurrun
90b5b51eab misc typo fixes 
Originally committed as revision 9291 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-12 18:50:50 +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
Diego Biurrun
04d7f60143 Add official LGPL license headers to the files that were missing them. 
Originally committed as revision 6219 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-10 14:02:42 +00:00
Diego Biurrun
f038fe8b4a warning fixes by Luca Abeni, lucabe72 ##@## email ##.## it 
Originally committed as revision 4898 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-25 22:10:13 +00:00
Diego Biurrun
115329f160 COSMETICS: Remove all trailing whitespace. 
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-17 18:14:38 +00:00
Michael Niedermayer
c26ae41db2 adding a few const 
Originally committed as revision 4337 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-06-01 21:19:00 +00:00
Michael Niedermayer
5ff85f1d8b AVRational 
sample_aspect_ratio
aspect ratio in JPEG JFIF is SAR not DAR !
removed nonsense SAR guessing code
various related cleanups
bugs?

Originally committed as revision 2403 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-10-20 20:23:46 +00:00
Michael Niedermayer
34790165dc intra dc treshold != 0 decoding fixed 
Originally committed as revision 2363 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-10-12 14:01:53 +00:00
Alex Beregszaszi
4b0e52f635 warning fix 
Originally committed as revision 2019 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-07-07 16:06:00 +00:00
Michael Niedermayer
7bc9090a41 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture 
more direct use of the new mb_type stuff instead of codec specific stuff
runtime mb_type debug output h264/h263 variants/mpeg1/2/4
error concealment /resilience for mpeg1/2
various minor optimizations

Originally committed as revision 1746 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-04-10 13:18:38 +00:00
Michael Niedermayer
a4e8b58761 rvlc decoding support 
Originally committed as revision 1678 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-03-12 23:09:18 +00:00
Michael Niedermayer
983e3246b7 per file doxy 
Originally committed as revision 1634 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-03-06 11:32:04 +00:00
Zdenek Kabelac
0c1a9edad4 * UINTX -> uintx_t INTX -> intx_t 
Originally committed as revision 1578 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-02-11 16:35:48 +00:00
Michael Niedermayer
41773b735e correcter mpeg4 headers 
Originally committed as revision 1376 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-12-30 00:28:42 +00:00
Michael Niedermayer
f8af5cb5a4 correct mpeg4 vo type 
Originally committed as revision 1324 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-12-09 00:06:15 +00:00
Michael Niedermayer
4d2858deac better/cleaner error resilience (done in a 2nd pass after decoding) 
h263/mpeg4 out of order slice decoding

Originally committed as revision 1030 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-10-13 13:16:04 +00:00
Michael Niedermayer
2ad1516a6c idct permutation cleanup, idct can be selected per context now 
fixing some threadunsafe code

Originally committed as revision 980 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-09-29 22:44:22 +00:00
Michael Niedermayer
bea669e57c interlaced mpeg4 b frame decoding 
Originally committed as revision 936 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-09-13 09:45:32 +00:00
Michael Niedermayer
8f8402e49c dc scale simplification/optimization 
Originally committed as revision 695 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-06-18 00:46:02 +00:00
Michael Niedermayer
5bb6fbb351 data partitioning 
Originally committed as revision 644 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-06-02 12:23:22 +00:00
Juanjo
1e209222f5 - H263 PAR support by Alex Beregszaszi. 
- Typo fix in mpeg4data.

Originally committed as revision 436 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-05-03 18:11:23 +00:00
Michael Niedermayer
1ff662cc2c export delay info 
fixed low_delay & vo_type on mpeg4 header writer & parser

Originally committed as revision 415 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-04-22 19:04:28 +00:00
Michael Niedermayer
3bf43d42ed mpeg4 mpeg quantizer support 
Originally committed as revision 381 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-04-07 02:03:32 +00:00
Michael Niedermayer
84afee348f msmpeg4v2 decoding (no encoding yet) 
Originally committed as revision 376 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-04-05 04:09:04 +00:00
Michael Niedermayer
6f91bcd151 mpeg4 b-frames :) 
create slightly more correct headers & add "ffmpeg" user-data section

Originally committed as revision 328 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-03-12 22:54:25 +00:00
Michael Niedermayer
73c8e5144a gmc bitstream decoding support (the real motion compensation isnt implemnted yet) 
Originally committed as revision 318 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-03-07 13:27:15 +00:00
Michael Niedermayer
cc9ba006ec parsing more of the mpeg4 header & print some "not supported" stuff 
Originally committed as revision 317 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-03-05 13:58:13 +00:00
Fabrice Bellard
689b775b85 updated scans 
Originally committed as revision 50 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2001-08-07 22:47:28 +00:00
Fabrice Bellard
de6d9b6404 Initial revision 
Originally committed as revision 5 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2001-07-22 14:18:56 +00:00