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

30 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
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
Måns Rullgård
f079a64aea Move cavs dsp functions to their own struct
Originally committed as revision 24685 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-03 20:59:00 +00:00
Måns Rullgård
84dc2d8afa Remove DECLARE_ALIGNED_{8,16} macros
These macros are redundant.  All uses are replaced with the generic
DECLARE_ALIGNED macro instead.

Originally committed as revision 22233 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 14:24:59 +00:00
Stefan Gehrer
3cc3581dc0 fix intra prediction modes with inter-MB neighbors,
the old sample clips are in violation of the 2006 spec

Originally committed as revision 21883 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-18 18:23:48 +00:00
Stefan Gehrer
35122bd93e add heuristic to discern the old sample clips from streams encoded
with rm52j encoder, a marker_bit has been added in the I-Frame syntax

Originally committed as revision 21836 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-15 16:43:45 +00:00
Stefan Gehrer
6847ab4375 introduce a macroblock index to avoid a few x*width+y calculations
Originally committed as revision 17138 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 22:38:02 +00:00
Stefan Gehrer
d934de5c5d do not check for minimum slice start code, 0x00000100 is valid
Originally committed as revision 17133 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 16:34:45 +00:00
Stefan Gehrer
bef01ca08f rename XXX_t enums to cavs_XXX to fix POSIX namespace issue
Originally committed as revision 16642 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-16 17:45:54 +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
5d2b15b870 have less functions as inline
Originally committed as revision 9792 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-25 05:09:54 +00:00
Måns Rullgård
bad700e346 trivial warning fixes
Originally committed as revision 9547 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-08 23:14:54 +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
ceb48b46f8 prepare splitting decoder-only parts into own file:
make commonly used functions global

Originally committed as revision 9519 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-07 07:35:18 +00:00
Stefan Gehrer
218b3ae970 move dequantization into its own inline function
Originally committed as revision 9518 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-07 07:14:58 +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
07caa46e99 setting special motion vectors in intra macroblocks
is now in its own inline function

Originally committed as revision 9516 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-07 06:34:30 +00:00
Stefan Gehrer
8a35c8e71a setting intra prediction modes to default values
in inter macroblocks is now in its own inline
function

Originally committed as revision 9515 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-07 06:27:44 +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
e183b6d17c move preparation of chroma intra prediction into its
own inline function

Originally committed as revision 9513 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-07 05:27:59 +00:00
Stefan Gehrer
b8524fd13f move existing inline functions from cavs.c to cavs.h
Originally committed as revision 9512 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-07 05:03:22 +00:00
Stefan Gehrer
2a3cc9730f move context structure definition from cavs.c to cavs.h
Originally committed as revision 9511 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-07 04:58:54 +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
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