1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Commit Graph

62 Commits

Author SHA1 Message Date
Michael Niedermayer
dd8ffc1925 Merge remote-tracking branch 'qatar/master'
* qatar/master: (47 commits)
  lavc: hide private symbols.
  lavc: deprecate img_get_alpha_info().
  lavc: use avpriv_ prefix for ff_toupper4.
  lavc: use avpriv_ prefix for ff_copy_bits and align_put_bits.
  lavc: use avpriv_ prefix for ff_ac3_parse_header.
  lavc: use avpriv_ prefix for ff_frame_rate_tab.
  lavc: rename ff_find_start_code to avpriv_mpv_find_start_code
  lavc: use avpriv_ prefix for ff_split_xiph_headers.
  lavc: use avpriv_ prefix for ff_dirac_parse_sequence_header.
  lavc: use avpriv_ prefix for some dv symbols used in lavf.
  lavc: use avpriv_ prefix for some flac symbols used in lavf.
  lavc: use avpriv_ prefix for some mpeg4audio symbols used in lavf.
  lavc: use avpriv_ prefix for some mpegaudio symbols used in lavf.
  lavc: use avpriv_ prefix for ff_aac_parse_header().
  lavf: hide private symbols.
  lavf: use avpriv_ prefix for some dv functions.
  lavf: use avpriv_ prefix for ff_new_chapter().
  avcodec: add CODEC_CAP_DELAY note to avcodec_decode_audio3() documentation
  avcodec: clarify the CODEC_CAP_DELAY note in avcodec_decode_video2()
  avcodec: clarify documentation of CODEC_CAP_DELAY
  ...

Conflicts:
	configure
	doc/general.texi
	libavcodec/Makefile
	libavcodec/aacdec.c
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/dv.c
	libavcodec/dvdata.c
	libavcodec/dvdata.h
	libavcodec/libspeexenc.c
	libavcodec/mpegvideo.c
	libavcodec/version.h
	libavformat/avidec.c
	libavformat/dv.c
	libavformat/dv.h
	libavformat/flvenc.c
	libavformat/mov.c
	libavformat/mp3enc.c
	libavformat/oggparsespeex.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-21 02:01:26 +02:00
Anton Khirnov
242c73a0fd lavc: use avpriv_ prefix for some dv symbols used in lavf.
Specifically, ff_dv_frame_profile and ff_dv_codec_profile.
2011-10-20 21:06:58 +02:00
Michael Niedermayer
63d2cfd142 dvdec: Fix dvsd profile[1] detection.
Fixes Ticket159
If someone knows of a cleaner way to detect this, patch is welcome.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-02 05:21:25 +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 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
Reimar Döffinger
10249a5f31 Split VLC-related tables out of dvdata.h to make it easier to add support
for hard-coding tables.

Originally committed as revision 22620 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-21 14:43:50 +00:00
Reimar Döffinger
c76911bd65 Split parts of dvdata.h into dvdata.c, this ensures that things like
work_chunks_* and dv_idct_factor_* variables appear only once in the binary
instead of 3 times.
Saves 3264 bytes in .rodata and 312416 bytes in .bss on x86_64.

Originally committed as revision 20246 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-16 07:55:57 +00:00
Maksym Veremeyenko
fbec307f6c Allow decoding of 625/50 (PAL) with video_stype==1.
Patch by Maksym Veremeyenko, verem m1stereo tv

Originally committed as revision 20018 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-24 19:37:41 +00:00
Baptiste Coudurier
d509c743b7 check if frame size matches old sys and assumes corrupted input, fixes #1192
Originally committed as revision 19192 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-14 22:34:28 +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
Baptiste Coudurier
a4fd53c427 fix decoding 720p50 audio samples
Originally committed as revision 16906 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-31 22:10:23 +00:00
Diego Biurrun
406792e7b0 cosmetics: Remove pointless period after copyright statement non-sentences.
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19 15:46:40 +00:00
Roman Shaposhnik
a21fd75f56 Making idct factor tables dynamically allocated
Originally committed as revision 15885 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-20 01:40:40 +00:00
Roman Shaposhnik
195b349041 Getting rid of huge static DV tables
Originally committed as revision 15874 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-18 20:48:26 +00:00
Roman Shaposhnik
2ae7e12430 Taking advantage of the new ->execute API
Originally committed as revision 15806 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-12 21:13:28 +00:00
Roman Shaposhnik
c3d470b4a9 implementing more efficient (and direct) allocation of work for DV codec workers
Originally committed as revision 15788 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-08 00:18:00 +00:00
Diego Biurrun
f94036f159 prettyprinting cosmetics
Originally committed as revision 15682 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-24 21:41:27 +00:00
Diego Biurrun
75f2c20983 spelling cosmetics
Originally committed as revision 15681 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-24 21:37:06 +00:00
Aurelien Jacobs
37d3e0667a uses FF_ARRAY_ELEMS() where appropriate
Originally committed as revision 15662 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-21 21:40:24 +00:00
Roman Shaposhnik
4e92dabf60 replacing frame_rate and frame_rate_base with an AVRational time_base
Originally committed as revision 15584 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-07 16:59:18 +00:00
Roman Shaposhnik
45580f8d4d cosmetic updates as per Michael's suggestion
Originally committed as revision 15582 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-07 16:07:15 +00:00
Roman Shaposhnik
90d30402b4 vertically aligning as per Michael's suggestion
Originally committed as revision 15581 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-07 16:06:18 +00:00
Roman Shaposhnik
2b6cee9f1e Doxygenizing the comments
Originally committed as revision 15578 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-07 15:50:29 +00:00
Diego Biurrun
910f02a054 spelling cosmetics
Originally committed as revision 15518 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-02 16:28:58 +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
Roman Shaposhnik
f8007a1473 Intial implementation of the DV100 (AKA DVCPRO HD) decoder and demuxer as
specified in SMPTE 370M

Originally committed as revision 15010 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-28 22:41:00 +00:00
Roman Shaposhnik
b4e0102c5c Introducing video_stype for holding the value of VAUX source pack
and simplifying dv_frame_profile

Originally committed as revision 15007 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-28 19:21:59 +00:00
Roman Shaposhnik
c89cb5894e Making block size in bits variable and dependent on the DV spec
Originally committed as revision 14842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 16:02:43 +00:00
Roman Shaposhnik
713c1aa9a6 Making the number of blocks per macroblock dependent on the DV stream
specification

Originally committed as revision 14841 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 16:01:41 +00:00
Roman Shaposhnik
cb879ec2fb Introducing DV_MAX_BPM macro instead of a hardcoded value for the
highest number of blocks per macroblock

Originally committed as revision 14840 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 16:00:26 +00:00
Roman Shaposhnik
3f66d16821 Fixing the units in DV50 tables (both coordinates are
supposed to be in units of 8 pixels) and simplifying
the calculations of y_ptr and c_offset.

Originally committed as revision 14693 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-11 10:14:46 +00:00
Roman Shaposhnik
d557838cfb Coalescing the un-weighting and de-quantization steps for faster
processing

Originally committed as revision 14691 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-11 09:35:58 +00:00
Diego Biurrun
245976da2a Use full path for #includes from another directory.
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-09 11:56:36 +00:00
Michael Niedermayer
095f08d599 some const
Originally committed as revision 11758 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-01 15:08:55 +00:00
Diego Biurrun
aa6b38c29d Fix random typos.
Originally committed as revision 11477 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-08 23:08:51 +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
Roman Shaposhnik
263c241226 * making profile selection a bit more tolerant to the badly broken streams
Originally committed as revision 9710 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-17 04:06:03 +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
Carl Eugen Hoyos
154e30f6c2 rename attribute_unused to av_unused and moves its declaration to common.h
patch by Carl Eugen Hoyos cehoyos chez ag or at
original thread: [FFmpeg-devel] [PATCH] attribute_unused -> av_unused
date: 05/29/2007 01:23 PM

Originally committed as revision 9155 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-30 09:32:25 +00:00
Reimar Döffinger
e36d79c837 Change some leftover __attribute__((unused)) and __attribute__((used)) to
attribute_unused and attribute_used respectively to ease compiling on non-gcc.

Originally committed as revision 9024 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-14 14:07:50 +00:00
Michael Niedermayer
045bdb5ab4 uint16->uint8
Originally committed as revision 7584 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-19 03:14:13 +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
Roman Shaposhnik
3c8f30a745 * Restructuring the division of labor between DV codec and DV format
[ Based on a patch by Brian Brice (bbrice at newtek dot com) ]

Originally committed as revision 6161 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-04 03:33:11 +00:00
Daniel Maas
0b297700b7 DVCPRO50 support.
Patch by Daniel Maas dmaas at maasdigital dot com

Originally committed as revision 5113 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-06 08:54:33 +00:00
Dan Maas
2e52b44e50 AC coefficient weighing (per SMPTE 314M) for the DV encoder and decoder. The
performance impact is less than 1%.

Patch by Dan Maas  (dmaas at maasdigital dot com)

Originally committed as revision 5070 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-27 04:50:06 +00:00
Diego Biurrun
5509bffa88 Update licensing information: The FSF changed postal address.
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-12 22:43:26 +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
Roman Shaposhnik
0bae10ccec * I was finally convinced. And besides, if err it's better to err with
everybody else around ;-)

Originally committed as revision 3460 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-14 06:58:24 +00:00