generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
29,476 Commits 24 Branches 241 Tags 173 MiB
0fea3b7b80
Commit Graph

162 Commits

Author SHA1 Message Date
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
Michael Niedermayer
c55780dcef Merge remote branch 'qatar/master' 
* qatar/master: (32 commits)
  libopencore-amr, libvo-amrwbenc: Allow enabling DTX via private AVOptions
  libopencore-amr, libvo-amrwbenc: Only check the bitrate when changed
  libopencore-amr, libvo-amrwbenc: Find the closest matching bitrate
  libvo-*: Fix up the long codec names
  libavcodec: Mark AVCodec->priv_class const
  swscale: Factorize FAST_BGR2YV12 definition.
  libvo-aacenc: Only produce extradata if the global header flag is set
  lavf: postpone removal of public metadata conversion API
  lavc: postpone removal of request_channels
  lavc: postpone removal of audioconvert and sample_fmt wrappers
  lavf: postpone removal of deprecated avio functions
  libopencore-amr: Cosmetics: Rewrap and align
  libopencore-amr, libvo-amrbwenc: Rename variables and functions
  libopencore-amr: Convert commented out debug logging into av_dlog
  libopencore-amr: Remove an unused state variable
  libvo-amrwbenc: Don't explicitly store bitrate modes in the bitrate table
  libopencore-amr: Remove a useless local variable
  libopencore-amr, libvo-amrwbenc: Make the bitrate/mode mapping array static const
  libopencore-amr, libvo-amrwbenc: Return proper error codes in most places
  libopencore-amr: Don't print carriage returns in log messages
  ...

Conflicts:
	doc/developer.texi
	libavcodec/avcodec.h
	libavcodec/libvo-aacenc.c
	libavcodec/libvo-amrwbenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-14 03:21:38 +02:00
Alberto Delmas
d294015510 Check for successful h263 init in msmpeg4 init 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-04-12 19:46:44 -04: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
Carl Eugen Hoyos
dca85c842d Mark MS-MPEG4v1 encoder as experimental. 
The encoder has never produced files that could be decoded
with any software.
 2011-02-25 15:39:49 +01: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
Mans Rullgard
91d51ee4b5 Remove redundant checks against MIN_CACHE_BITS 
With the removal of the libmpeg2 bitstream reader, MIN_CACHE_BITS
is always >= 25, so tests against smaller values can be removed.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit f162e988aa)
 2011-01-23 19:32:09 +01:00
Mans Rullgard
f162e988aa Remove redundant checks against MIN_CACHE_BITS 
With the removal of the libmpeg2 bitstream reader, MIN_CACHE_BITS
is always >= 25, so tests against smaller values can be removed.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-23 16:41:04 +00:00
Måns Rullgård
b3c1652b82 msmpeg4v1: fix undefined behaviour in msmpeg4_decode_picture_header() 
Because the order of evaluation of subexpressions is undefined, two
get_bits() calls may not be part of the same expression.  In this
specific case, using get_bits_long() is simpler.

This fixes msmpeg4v1 decoding with armcc.

Originally committed as revision 24902 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-24 15:40:57 +00:00
Carl Eugen Hoyos
0fd0ef7947 Add new decoder property max_lowres and do not init decoder if requested value is higher. 
Originally committed as revision 24098 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-07 21:23:36 +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
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
Michael Niedermayer
ed3e91489b Implement cool new vlc code. 
Fixes issue1637

Originally committed as revision 21635 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-04 14:26:57 +00:00
Michael Niedermayer
261a3c2d05 Move AVCodecs from h263dec.c to msmpeg4.c and disentangle init decode init. 
Originally committed as revision 21102 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-08 19:40:10 +00:00
Michael Niedermayer
7213abf6ba Use h263 tables in msmpeg4v1 dont duplicate them halfway. 
Originally committed as revision 21101 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-08 19:10:11 +00:00
Michael Niedermayer
101ada9abd Rename most non static h263 tables so their name contains h263. 
Originally committed as revision 21098 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-08 17:51:48 +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
f9310cbb2f Remove unused function msmpeg4_memsetw(). 
It is an exact duplicate of memsetw() in h263.c.

Originally committed as revision 20986 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-31 01:27:47 +00:00
Diego Biurrun
8380edd947 cosmetics: Reorder functions to avoid forward declarations. 
Originally committed as revision 20977 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-30 14:15:12 +00:00
Diego Biurrun
941870cd35 Remove unnecessary forward declaration for msmpeg4_memsetw(). 
Originally committed as revision 20976 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-30 13:48:03 +00:00
Ronald S. Bultje
6e44ba1550 Use get_bits_left() instead of size_in_bits - get_bits_count(). 
Originally committed as revision 20543 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-16 17:42:43 +00:00
Reimar Döffinger
f2d702e109 Replace #ifdef PIC checks with the more appropriate HAVE_EBX_AVAILABLE/HAVE_7REGS. 
Originally committed as revision 19676 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-21 09:54:28 +00:00
Diego Biurrun
7881793dd0 Remove unused debug av_log() calls. 
Originally committed as revision 19549 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-30 20:57:41 +00:00
Diego Biurrun
07fd17823f Remove unused variable intra_count. 
Originally committed as revision 19537 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-30 07:33:16 +00:00
Diego Biurrun
9be6f0d2f8 Do not check for both CONFIG_VC1_DECODER and CONFIG_WMV3_DECODER, 
the former depends upon the latter.

Originally committed as revision 19533 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-29 09:54:49 +00:00
Michael Niedermayer
03d5ea54c1 Get rid of an unused variable, found by the clang static analyzer. 
Originally committed as revision 18544 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 12:41:37 +00:00
Michael Niedermayer
5cf4331b04 Get rid of INIT_VLC_USE_STATIC in msmpeg4 
Originally committed as revision 18433 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-11 13:29:05 +00:00
Carl Eugen Hoyos
e161e007be Use INIT_VLC_USE_STATIC and not its value "1". 
Originally committed as revision 18430 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-11 11:47:15 +00:00
Daniel Verkamp
5ef251e504 Add missing av_cold in static init/close functions. 
Patch by Daniel Verkamp daniel at drv dot nu.

Originally committed as revision 17526 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-22 13:48:55 +00:00
Michael Niedermayer
a503722750 Fix: libavcodec/msmpeg4.c:1612: warning: ‘dc_pred_dir’ may be used uninitialized in this function 
Originally committed as revision 17106 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-09 22:04:34 +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
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
Aurelien Jacobs
49fb20cb8a replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_ 
and remove all ENABLE_ definitions.

Originally committed as revision 16600 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-14 17:19:17 +00:00
Aurelien Jacobs
b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*. 
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 23:44:16 +00:00
Diego Pettenò
be449fca79 Convert asm keyword into __asm__. 
Neither the asm() nor the __asm__() keyword is part of the C99
standard, but while GCC accepts the former in C89 syntax, it is not
accepted in C99 unless GNU extensions are turned on (with -fasm). The
latter form is accepted in any syntax as an extension (without
requiring further command-line options).

Sun Studio C99 compiler also does not accept asm() while accepting
__asm__(), albeit reporting warnings that it's not valid C99 syntax.

Originally committed as revision 15627 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-16 13:34:09 +00:00
Diego Pettenò
cb92c528d9 Mark the ff_find_best_tables symbol static to msmpeg4. Patch by Diego Pettenò 
Originally committed as revision 15550 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-04 09:43:11 +00:00
Michael Niedermayer
047599a4ba Rename error_resilience to error_recognition. 
Originally committed as revision 15270 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-08 18:18:49 +00:00
Ramiro Polla
6647ab80e3 bitstream: move put_sbits() from flacenc.c to bitstream.h and use it 
throughout libavcodec.

Originally committed as revision 14204 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-13 14:27:48 +00:00
Stefan Gehrer
5a89396989 remove duplicate tables 
Originally committed as revision 13959 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-25 11:33:49 +00:00
Michael Niedermayer
ceaaf78bb7 Change init_vlc_rl() so it does not use *alloc_static() anymore. 
Originally committed as revision 13567 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-30 21:08:41 +00:00
Aurelien Jacobs
9701840bb5 add FF_ prefix to all (frame)_TYPE usage 
Originally committed as revision 12399 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-09 23:31:02 +00:00
Diego Biurrun
5e53486545 typo fix: inited --> initialized 
Originally committed as revision 11920 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-13 09:26:10 +00:00
Sigbjørn Skjæret
9ad5675f25 Add a couple of missing consts. 
patch by Sigbjørn Skjæret, cisc broadpark no

Originally committed as revision 11528 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-14 22:10:19 +00:00
Aurelien Jacobs
c16d6c5061 cosmetics: indentation 
Originally committed as revision 10952 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-07 23:42:24 +00:00
Aurelien Jacobs
cc6de104f8 split wmv2 in its own file 
Originally committed as revision 10951 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-07 23:41:39 +00:00
Aurelien Jacobs
85f601ee7b rename some msmpeg4 symbols and make them non-static 
so that they can be used in standalone wmv2.c

Originally committed as revision 10949 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-07 23:23:35 +00:00
Diego Biurrun
9488b966c7 Move msmpeg4 tables from a header file to msmpegdata.c. 
Originally committed as revision 10107 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-13 17:57:06 +00:00