1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Commit Graph

26 Commits

Author SHA1 Message Date
Michael Niedermayer
72153419b5 Merge remote branch 'qatar/master'
* qatar/master: (33 commits)
  rtpdec_qdm2: Don't try to parse data packet if no configuration is received
  ac3enc: put the counting of stereo rematrixing bits in the same place to make the code easier to understand.
  ac3enc: clean up count_frame_bits() and count_frame_bits_fixed()
  mpegvideo: make FF_DEBUG_DCT_COEFF output coeffs via av_log() instead of just via AVFrame.
  srtdec: make sure we don't write past the end of buffer
  wmaenc: improve channel count and bitrate error handling in encode_init()
  matroskaenc: make sure we don't produce invalid file with no codec ID
  matroskadec: check that pointers were initialized before accessing them
  lavf: fix function name in compute_pkt_fields2 av_dlog message
  lavf: fix av_find_best_stream when providing a wanted stream.
  lavf: fix av_find_best_stream when decoder_ret is given and using a related stream.
  ffmpeg: factorize quality calculation
  tiff: add support for SamplesPerPixel tag in tiff_decode_tag()
  tiff: Prefer enum TiffCompr over int for TiffContext.compr.
  mov: Support edit list atom version 1.
  configure: Enable libpostproc automatically if GPL code is enabled.
  Cosmetics: fix prototypes in oggdec
  oggdec: fix memleak with continuous streams.
  matroskaenc: add missing new line in av_log() call
  dnxhdenc: add AVClass in private context.
  ...

swscale changes largely rewritten by me or replaced by baptsites due to lots of bugs in ronalds code.
Above code is also just in case its not obvios to a large extended duplicates that where cherry picked
from ffmpeg.

Conflicts:
	configure
	ffmpeg.c
	libavformat/matroskaenc.c
	libavutil/pixfmt.h
	libswscale/ppc/swscale_template.c
	libswscale/swscale.c
	libswscale/swscale_template.c
	libswscale/utils.c
	libswscale/x86/swscale_template.c
	tests/fate/h264.mak
	tests/ref/lavfi/pixdesc_le
	tests/ref/lavfi/pixfmts_copy_le
	tests/ref/lavfi/pixfmts_null_le
	tests/ref/lavfi/pixfmts_scale_le
	tests/ref/lavfi/pixfmts_vflip_le

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-13 04:40:40 +02:00
Diego Biurrun
0a6b1a9f21 Replace int_fast integer types with their sized standard posix counterparts.
The _fast integer types provide no realworld benefits, but may introduce
portability issues and are just plain ugly.
2011-05-12 12:05:54 +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
Måns Rullgård
49bd8e4b84 Fix grammar errors in documentation
Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-30 15:38:06 +00:00
Stefan Gehrer
e685e8eada rename vector_t to cavs_vector
Originally committed as revision 16641 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-16 17:20:17 +00:00
Diego Biurrun
9506090df9 Avoid POSIX-reserved _t in identifier names.
Originally committed as revision 16142 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-15 10:08:31 +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
Stefan Gehrer
844d9012a6 split decoder-specific parts into their own file
Originally committed as revision 9533 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-08 07:37:30 +00:00
Stefan Gehrer
1503063f83 prepare splitting decoder-only parts into own file:
make commonly used tables global

Originally committed as revision 9532 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-08 07:13:25 +00:00
Stefan Gehrer
ce7088b9a8 cosmetic: rename VLC tables to make clear they
are for decoding

Originally committed as revision 9517 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-07 06:49:20 +00:00
Stefan Gehrer
25c899471d move modification of intra prediction modes into
its own inline function

Originally committed as revision 9514 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-07 06:15:05 +00:00
Stefan Gehrer
ac83e7b235 make vector constants global
Originally committed as revision 9510 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-07 04:54:05 +00:00
Diego Biurrun
e5a389a1b7 license header consistency cosmetics
Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-05 10:40:25 +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
Aurelien Jacobs
b88e211426 move defines and enums out of cavsdata.h
Originally committed as revision 8944 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-08 23:58:35 +00:00
Aurelien Jacobs
20c11e4cee avoid a clash between two definitions of SEQ_START_CODE
Originally committed as revision 8903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-05 18:31:34 +00:00
Stefan Gehrer
53aa68b329 move all cavs-parsing to cavs.c
This should help building parser without decoder

Originally committed as revision 6993 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-12 20:18:07 +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
Stefan Gehrer
50879935d1 replace run by run+1 in VLC tables
Originally committed as revision 5751 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-14 19:15:08 +00:00
Stefan Gehrer
c90c39190e change partition flags SYM -> FWD|SYM
Originally committed as revision 5749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-14 18:56:17 +00:00
Michael Niedermayer
69f34e5b1f simplify
Originally committed as revision 5694 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-09 15:20:18 +00:00
Stefan Gehrer
f503b19574 cosmetic patch:
Doxygen-style comments
added some more comments

Originally committed as revision 5602 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-03 17:37:57 +00:00
Michael Niedermayer
b482e2d12f CAVS decoder by (Stefan Gehrer stefan.gehrer gmx.de)
Originally committed as revision 5590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-03 00:16:45 +00:00
Michael Niedermayer
0abc2e73f8 new files for the CAVS decoder by (Stefan Gehrer <stefan gehrer gmx de)
Originally committed as revision 5567 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-01 22:52:56 +00:00