virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
36,847 Commits 37 Branches 400 Tags 460 MiB
bb4c0abc7c
Commit Graph

434 Commits

Author SHA1 Message Date
Michael Niedermayer
988f585fcb Merge remote-tracking branch 'qatar/master' 
* qatar/master: (44 commits)
  replacement Indeo 3 decoder
  gsm demuxer: do not allocate packet twice.
  flvenc: use first packet delay as global delay.
  ac3enc: doxygen update.
  imc: return error codes instead of 0 for error conditions.
  imc: return meaningful error codes instead of -1
  imc: do not set channel layout for stereo
  imc: validate channel count
  imc: check for ff_fft_init() failure
  imc: check output buffer size before decoding
  imc: use DSPContext.bswap16_buf() to byte-swap packet data
  rtsp: add allowed_media_types option
  libgsm: add flush function to reset the decoder state when seeking
  libgsm: simplify decoding by using a loop
  gsm: log error message when packet is too small
  libgsmdec: do not needlessly set *data_size to 0
  gsmdec: do not needlessly set *data_size to 0
  gsmdec: add flush function to reset the decoder state when seeking
  libgsmdec: check output buffer size before decoding
  gsmdec: log error message when output buffer is too small.
  ...

Conflicts:
	Changelog
	ffplay.c
	libavcodec/indeo3.c
	libavcodec/mjpeg_parser.c
	libavcodec/vp3.c
	libavformat/cutils.c
	libavformat/id3v2.c
	libavutil/parseutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-03 02:16:26 +01:00
Diego Biurrun
124e28847b Remove some stray unnecessary ffmpeg references. 2011-11-02 10:42:54 +01:00
Michael Niedermayer
e10979ff56 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  changelog: misc typo and wording fixes
  H.264: add filter_mb_fast support for >8-bit decoding
  doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support.
  lls: use av_lfg instead of rand() in test program
  build: remove unnecessary dependency on libs from 'all' target
  H.264: avoid redundant alpha/beta calculations in loopfilter
  H.264: optimize intra/inter loopfilter decision
  mpegts: fix Continuity Counter error detection
  build: remove unnecessary FFLDFLAGS variable
  vp8/mt: flush worker thread, not application thread context, on seek.
  mt: proper locking around release_buffer calls.
  DxVA2: unbreak build after [657ccb5ac7]
  hwaccel: unbreak build
  Eliminate FF_COMMON_FRAME macro.

Conflicts:
	Changelog
	Makefile
	doc/developer.texi
	libavcodec/avcodec.h
	libavcodec/h264.c
	libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-12 01:42:32 +02:00
Diego Biurrun
657ccb5ac7 Eliminate FF_COMMON_FRAME macro. 
FF_COMMON_FRAME holds the contents of the AVFrame structure and is also copied
to struct Picture.  Replace by an embedded AVFrame structure in struct Picture.
 2011-07-11 00:19:00 +02:00
Stefano Sabatini
ce5e49b0c2 replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_* 2011-05-02 16:41:41 +02:00
Stefano Sabatini
975a1447f7 Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*. 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-05-02 12:18:44 +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
Michael Niedermayer
fc4a2d1e8c Change ref_index structure so it matches how its organized in h264. 
Also revert the related error concealment hotfix.

Originally committed as revision 22640 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-23 02:17:04 +00:00
Michael Niedermayer
fc53b6afee Split H263 encoder and decoder from common code. 
Originally committed as revision 21109 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-09 14:59:06 +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
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
51ce2207c8 Add a few CONFIG_MPEG4_DECODER that should be there. 
Originally committed as revision 21082 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-08 04:00:06 +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
Michael Niedermayer
46244c640c Add some const qualifiers. 
Originally committed as revision 21064 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 15:46:45 +00:00
Michael Niedermayer
616251c924 Document decide_ac_pred() and restore_ac_coeffs(). 
Originally committed as revision 21063 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 15:43:49 +00:00
Michael Niedermayer
d6856c5708 Move restore_ac_coeffs() call into decode_ac_pred(). 
This makes decode_ac_pred() easier to understand.

Originally committed as revision 21062 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 15:31:54 +00:00
Michael Niedermayer
0dc5dc08db Move restore_ac_coeffs() up so its declared before its use. 
Originally committed as revision 21061 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 15:24:50 +00:00
Michael Niedermayer
64f716b499 More doxy 
Originally committed as revision 21060 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 15:12:31 +00:00
Michael Niedermayer
4fea04820b Factorize if() surrounding every ff_h263_show_pict_info() call. 
Originally committed as revision 21058 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 14:55:11 +00:00
Michael Niedermayer
d7525cba23 Split out intel H263 decoder. 
Originally committed as revision 21054 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 06:25:41 +00:00
Michael Niedermayer
a0b0d75368 Split flv decoding out. 
Originally committed as revision 21051 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 05:36:45 +00:00
Michael Niedermayer
eb52376915 Split out flv encoding. 
Originally committed as revision 21050 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 04:42:39 +00:00
Michael Niedermayer
f867378771 Document aspect_to_info(). 
Originally committed as revision 21049 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 04:01:19 +00:00
Michael Niedermayer
f016159416 Cleanup aspect_to_info(). 
Originally committed as revision 21048 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 03:58:12 +00:00
Michael Niedermayer
214cb565c0 Document several more things. 
Originally committed as revision 21047 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 03:54:10 +00:00
Michael Niedermayer
b0704443f2 Document *VLC_BITS. 
Originally committed as revision 21046 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 03:40:41 +00:00
Michael Niedermayer
046be9299f Simplify h263_get_picture_format(). 
Originally committed as revision 21045 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 03:36:46 +00:00
Diego Biurrun
50fe16960b Add a few explanatory comments to cornercase workarounds. 
Originally committed as revision 21030 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-05 10:18:01 +00:00
Stefano Sabatini
702d0a9e85 Remove residual use of the doxygen markup which is deprecated, 
consistent with r19122.

Originally committed as revision 20989 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-01 12:28:18 +00:00
Diego Biurrun
20390e3170 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations. 
Originally committed as revision 20981 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-30 16:10:52 +00:00
Diego Biurrun
df8d98c4dd 10l: Move ff_mpeg4_pred_dc() to an appropriate place. 
It is used by both encoders and decoders and should not be below
a CONFIG_ENCODERS preprocessor check.

Originally committed as revision 20980 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-30 16:08:47 +00:00
Diego Biurrun
2a992f467a cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations. 
Originally committed as revision 20979 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-30 14:51:46 +00:00
Diego Biurrun
1436f31709 cosmetics: Move H.263-related functions around to avoid forward declarations. 
Originally committed as revision 20978 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-30 14:34:14 +00:00
Diego Biurrun
3f35415df7 cosmetics: Remove pointless '#if 1' preprocessor directives. 
Originally committed as revision 20949 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-28 15:27:49 +00:00
Diego Biurrun
43ad88e5c0 Remove commented-out debug console output. 
Originally committed as revision 20938 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-27 14:32:23 +00:00
Diego Biurrun
5ddd075daf cosmetics: Move a bunch of forward declarations below a CONFIG_ENCODERS #ifdef. 
This avoids a bunch of "‘foo’ declared ‘static’ but never defined" warnings
when compiling with encoders disabled.

Originally committed as revision 20937 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-27 14:28:43 +00:00
Michael Niedermayer
e4d1d920b0 Improve time_increment_bits guessing code. 
Originally committed as revision 20785 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-09 14:05:39 +00:00
Michael Niedermayer
9015b095bc Move ff_init_qscale_tab() from h263.c to mpegvideo, the function is not h263 specific. 
Originally committed as revision 20725 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-03 21:36:58 +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
Diego Biurrun
8b44de14d1 Change av_log() calls surrounded by '#ifdef DEBUG' into dprintf macros. 
Originally committed as revision 19550 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-30 21:00:08 +00:00
Benjamin Larsson
241f5eab32 Remove dead assignments found by CSA 
Originally committed as revision 18731 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-02 09:12:03 +00:00
Michael Niedermayer
339cdf9681 Remove useless init from ff_mpeg4_set_direct_mv() found by CSA. 
Originally committed as revision 18583 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 18:24:39 +00:00
Michael Niedermayer
feda8550a9 Remove several useless writes to variables, found by CSA. 
Originally committed as revision 18579 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 18:16:36 +00:00
Michael Niedermayer
01d83278e9 Remove unused variable in init_mv_penalty_and_fcode() found by CSA. 
Originally committed as revision 18557 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 14:42:02 +00:00
Michael Niedermayer
c2394854ed Remove useless assignment from h263_pred_dc() found by the clang static analyzer. 
Originally committed as revision 18547 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 12:57:47 +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
Gwenole Beauchesne
11b9397941 Record MPEG-4 sprite trajectory points [up to num_sprite_warping_points][isY]. 
Originally committed as revision 18250 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-30 20:39:08 +00:00
Ramiro Polla
d4efacff64 Use intptr_t when casting pointers to int. 
Originally committed as revision 18192 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-26 01:34:02 +00:00
Kostya Shishkov
c978997a88 Enable PB-frames decoding for H.263 
Originally committed as revision 17746 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-03 05:18:39 +00:00