virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Code Issues Releases Activity
71,877 Commits 37 Branches 400 Tags 463 MiB
287dbb0771
Commit Graph

111 Commits

Author SHA1 Message Date
Mans Rullgard
0d5c349ac4 put_bits: remove ALT_BITSTREAM_WRITER 
The code for this variant does not compile.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-02 16:25:27 +01:00
Michael Niedermayer
294e5475c2 ffv1: fix undefined behavior with insane widths. 
The new tables is large enough to prevent this together with our image size checks.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-13 20:42:14 +02:00
Michael Niedermayer
45fb647495 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  bitstream: Properly promote av_reverse values before shifting.
  libavutil/swscale: YUV444P10/YUV444P9 support.
  H.264: Fix high bit depth explicit biweight
  h264: Fix 10-bit H.264 x86 chroma v loopfilter asm.
  Replace DEBUG_SEEK/DEBUG_SI + av_log combinations by av_dlog.
  Update copyright year for ac3enc_opts_template.c.
  adts: Adjust frame size mask to follow the specification.
  movenc: Add RTP muxer/hinter options
  movenc: Pass the RTP AVFormatContext to the SDP generation
  rtspenc: Add RTP muxer options
  rtspenc: Add an AVClass for setting muxer specific options
  rtpenc_chain: Pass the rtpflags options through to the chained muxer
  rtpenc: Declare the rtp flags private AVOptions in rtpenc.h
  sdp: Reindent after the previous commit
  rtpenc: MP4A-LATM payload support
  avoptions: Add an av_opt_flag_is_set function for inspecting flag fields
  sdp: Allow passing an AVFormatContext to the SDP generation
  mov: Fix wrong timestamp generation for fragmented movies that have time offset caused by the first edit list entry.
  mpeg12: more advanced ffmpeg mpeg2 aspect guessing code.
  swscale: split YUYV output out of yuv2packed[12X]_c().

Conflicts:
	doc/APIchanges
	libavcodec/Makefile
	libavcodec/h264dsp_template.c
	libavcodec/mpeg12.c
	libavformat/aacdec.c
	libavformat/avidec.c
	libavformat/internal.h
	libavformat/movenc.c
	libavformat/rtpenc.c
	libavformat/rtpenc_latm.c
	libavformat/sdp.c
	libavformat/version.h
	libavutil/avutil.h
	libavutil/pixfmt.h
	libswscale/swscale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-11 03:51:36 +02:00
Alex Converse
19d824e473 bitstream: Properly promote av_reverse values before shifting. 2011-06-10 13:04:25 -07:00
Michael Niedermayer
d552f616a2 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (28 commits)
  Remove some non-compiling debug messages.
  ffplay: Fix non-compiling debug printf and replace it by av_dlog.
  H264: x86 predict init cosmetics.
  ac3enc: Fix linking of AC-3 encoder without the E-AC-3 encoder.
  Move E-AC-3 encoder functions to a separate eac3enc.c file.
  ac3enc: remove convenience macro, #define DEBUG
  ac3enc: remove unused #define
  vc1: re-initialize tables after width/height change.
  APIchanges: fill-in git commit hash for av_get_bytes_per_sample() addition
  samplefmt: add av_get_bytes_per_sample()
  iirfilter: fix biquad filter coefficients.
  swscale: remove duplicate conversion routine in swScale().
  swscale: add yuv2planar/packed function typedefs.
  swscale: integrate yuv2nv12X_C into yuv2yuvX() function pointers.
  swscale: reindent x86 init code.
  swscale: extract SWS_FULL_CHR_H_INT conditional into init code.
  swscale: cosmetics.
  swscale: remove alp/chr/lumSrcOffset.
  swscale: un-special-case yuv2yuvX16_c().
  shorten: Remove stray DEBUG #define and corresponding av_dlog statement.
  ...

Conflicts:
	doc/APIchanges
	libavcodec/ac3enc.c
	libavutil/avutil.h
	libavutil/samplefmt.c
	libswscale/swscale.c
	libswscale/swscale_internal.h
	libswscale/x86/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-08 05:25:28 +02:00
Diego Biurrun
02a8d43adf Replace some av_log/printf + #ifdef combinations by av_dlog. 2011-06-07 13:20:58 +02:00
Michael Niedermayer
676d380f2a Fix undefined behavior in ffv1 with insane widths. 
The new tables is large enough to prevent this together with our image size checks.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-01 12:49: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
Loren Merritt
f39ab2071f change a variable-length array to a malloc. 
Originally committed as revision 23103 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-12 22:38:05 +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
Loren Merritt
b23cf13c67 indent 
Originally committed as revision 22716 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-29 02:50:41 +00:00
Loren Merritt
3224079956 optimize init_vlc(). 
Reduce worst case time from O(N^2) to O(N*log(N)).
Speedup average case by a factor of 10 in ffv2 (total decoding speed +4-25%),
factor of 1.3 in ffvhuff (total +0.5%),
factor of 1.8 in indeo5 (total +1%),
factor of 1.1 in mjpeg (total +0.1%).

Originally committed as revision 22715 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-29 02:50:23 +00:00
Måns Rullgård
769c497565 indent 
Originally committed as revision 21940 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-21 15:11:59 +00:00
Måns Rullgård
4c4e746566 Avoid negative shifts in build_table() 
A shift by a negative amount has undefined behaviour.  Even though
the result of this shift is never used, the shift itself could
cause an exception of some kind.

Originally committed as revision 21939 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-21 15:11:57 +00:00
Stefano Sabatini
587edd6af8 Use more consistent / meaningful parameter names for the 
ff_copy_bits() function.

Originally committed as revision 20663 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-29 23:01:29 +00:00
Reimar Döffinger
ef530829f8 Remove ff_realloc_static, it is no longer used and since it was declared 
static there is no reason to wait for a major version bump, removing
it does not change ABI in any way, not even the non-public one.

Originally committed as revision 20023 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-24 22:39:47 +00:00
Reimar Döffinger
1e224c5480 Reindent. 
Originally committed as revision 20022 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-24 22:37:34 +00:00
Reimar Döffinger
e518a49f34 Remove a piece of code left-over from the removed alloc'd static vlc table code. 
Originally committed as revision 20021 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-24 22:36:52 +00:00
Reimar Döffinger
595324e143 Completely remove INIT_VLC_USE_STATIC, it is deprecated since ages and 
finally no longer used anywhere.

Originally committed as revision 20013 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-24 15:13:34 +00:00
Måns Rullgård
ec62d942ea Fix potentially unaligned accesses in ff_copy_bits() 
A pointer should never be assigned a value which may have less than the
required alignment of the target type.  Compilers may assume pointer
values have the required alignment, and emit normal load/store instructions.

Unaligned pointers should use a character type or compiler-specific
type modifiers.

Originally committed as revision 19318 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-01 17:48:22 +00:00
Stefano Sabatini
fb53b4a035 Rename pbBufPtr() to put_bits_ptr(). 
The new name is more readable and consistent with the FFmpeg naming
style.

Originally committed as revision 18497 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-13 16:59:38 +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
Stefano Sabatini
b275500706 Split bitstream.h, put the bitstream writer stuff in the new file 
put_bits.h.

Originally committed as revision 18461 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-12 08:35:26 +00:00
Stefano Sabatini
54b02ccda2 Rename the 'put_zero' parameter of ff_put_string() to 
'terminate_string'.

Originally committed as revision 18442 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-11 15:54:21 +00:00
Diego Biurrun
2bbd85719c Remove deprecated functions and structures on next version bump. 
Originally committed as revision 18110 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-21 13:51:29 +00:00
Måns Rullgård
f49568a467 Fix unaligned access in ff_copy_bits() 
Originally committed as revision 17921 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-09 23:27:38 +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
Stefan Gehrer
b3bf98aa56 move ff_log2_run to bitstream.c and reuse in ffv1.c 
Originally committed as revision 13989 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-26 16:39:21 +00:00
Michael Niedermayer
b13ddb3bca unused 
Originally committed as revision 13572 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-30 23:27:21 +00:00
Michael Niedermayer
b9c8388710 As *_static are not deallocated anymore except on program termination 
we do not need to keep track of them anymore.
Fixes CID117 RUN2 and various race conditions.

Originally committed as revision 13571 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-30 23:26:09 +00:00
Michael Niedermayer
83422c1940 unused 
Originally committed as revision 13570 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-30 21:17:10 +00:00
Michael Niedermayer
65de23d1b6 Remove non C code. 
Originally committed as revision 13569 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-30 21:15:34 +00:00
Michael Niedermayer
09dafaeba1 Move *_static to bitstream.c which is the only file left which needs 
them.

Originally committed as revision 13568 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-30 21:12:33 +00:00
Michael Niedermayer
ccc54864fe Make init_vlc* support proper static tables instead of this broken beyond 
imagination alloc_static() trash.

Originally committed as revision 13561 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-30 19:48:02 +00:00
Zuxy Meng
9f6152dfdb Apply 'alloc_size' attribute to ff_realloc_static() 
Originally committed as revision 12527 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-21 04:48:59 +00:00
Michael Niedermayer
1701cbfafc const 
Originally committed as revision 11846 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-04 00:49:14 +00:00
Diego Biurrun
1903245071 Ahem, fix typos overlooked in last commit. 
Originally committed as revision 9816 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-28 12:50:28 +00:00
Diego Biurrun
df3a80b50a cosmetics: misc typo fixes 
Originally committed as revision 9815 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-28 12:46:26 +00:00
Aurelien Jacobs
58e28fd5c4 simplify ff_copy_bits() when compiled with config-small 
Originally committed as revision 9526 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-07 23:03:14 +00:00
Aurelien Jacobs
5084ed3a9f simplify ff_copy_bits: merge 2 test branches 
Originally committed as revision 9504 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-06 14:14:41 +00:00
Aurelien Jacobs
98f7b56bb6 move ff_copy_bits to bitstream.c 
Originally committed as revision 9503 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-06 14:13:25 +00:00
Diego Biurrun
7b94177e37 Group all copyright and author notices together. 
Originally committed as revision 9483 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-05 10:37:29 +00:00
Måns Rullgård
85d366fd02 use av_freep() in free_vlc() and failed init_vlc() 
Originally committed as revision 9474 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-05 06:47:00 +00:00
Loren Merritt
b613bacca9 add init_vlc_sparse(). faster than init_vlc() if there are lots of holes in the tables. 
Originally committed as revision 9117 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-24 17:38:56 +00:00
Denis Fortin
b8a9974544 printf --> av_log, patch by Denis Fortin, fortin nerim net 
Originally committed as revision 9038 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-16 12:57:27 +00:00
Mark Cox
671adb1742 patch so that the deprecated items show up correctly 
when building doxygen docs
patch by mark cox melbournemark plus ffmpeg minus devel chez gmail dot com

Originally committed as revision 8866 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-02 09:13:47 +00:00
Måns Rullgård
d7645fb9db fix init_vlc() with nonzero flags 
Originally committed as revision 8443 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-18 22:32:39 +00:00
Michael Niedermayer
0769498a9f deprecate ff_realloc_static 
Originally committed as revision 8404 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-14 13:25:15 +00:00
Panagiotis Issaris
5dad0282b5 av_realloc_static() is an internal function and therefore should use the ff_ prefix instead of av_. 
Originally committed as revision 8089 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-23 00:20:39 +00:00
Panagiotis Issaris
beebfdb1e8 Move the av_realloc_static() declaration out of avcodec.h into bitstream.c. 
Originally committed as revision 8088 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-22 20:21:33 +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
Aurelien Jacobs
8fbc6aae75 move some functions to bitstream.h to avoid conflicts 
between different  bitstream readers in different codecs

Originally committed as revision 6117 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-28 18:44:49 +00:00
Michael Niedermayer
5a7bd28335 move align_get_bits() to .h to avoid conflicts between different bitstream readers in different codecs 
add a skip_bits_long() which can skip by any amount in any direction (several codecs contain half working hacks to do that)

Originally committed as revision 6093 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-26 10:26:14 +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
bb270c0896 COSMETICS: tabs --> spaces, some prettyprinting 
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-22 01:10:11 +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
Diego Biurrun
344b825ceb Rename put_string to ff_put_string to avoid a symbol clash on Mac OS X. 
Originally committed as revision 4597 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-09-18 21:21:01 +00:00
Michael Niedermayer
cea27ac714 LE bitstream reader based upon a patch by (Balatoni Denes <dbalatoni programozo hu) 
Originally committed as revision 4215 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-11 01:46:13 +00:00
Michael Niedermayer
caa336b4cc common.c -> bitstream.c (and the single non bitstream func -> utils.c) 
common.h -> common.h/bitstream.h

Originally committed as revision 3777 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-29 17:50:25 +00:00