1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-14 22:15:12 +02:00
Commit Graph

41 Commits

Author SHA1 Message Date
15285d8fc5 Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
  arm: remove disabled function dct_unquantize_h263_inter_iwmmxt()
  Remove commented-out call to non-existing function print_pow1().
  Do not decode RV30 files if the extradata is too small
  flashsv: split flashsv_decode_block() off from flashsv_decode_frame().
  ppc: remove disabled code
  libspeexdec: Drop const qualifier to silence compiler warning.
  libopenjpeg: Drop const qualifier to silence compiler warning.
  alac: Remove unused dummy code.
  Remove unused structs and tables.
  vaapi: do not assert on value read from input bitstream
  flashsvenc: replace bitstream description by a link to the specification
  flashsvenc: drop unnecessary cast
  flashsvenc: improve some variable names and fix corresponding comments
  flashsvenc: merge two consecutive if-conditions
  flashsvenc: merge variable declarations and initializations
  flashsvenc: convert some debug av_log() to av_dlog()
  flashsvenc: whitespace cosmetics
  flashsvenc: drop some unnecessary parentheses
  flashsvenc: fix some comment typos
  aacps: skip some memcpy() if src and dst would be equal
  ...

Conflicts:
	libavcodec/vaapi_mpeg2.c
	libavformat/aviobuf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-16 19:43:35 +02:00
86e8272a23 flashsvenc: replace bitstream description by a link to the specification
An official specification now exists and it is both more detailed and
easier to understand than the incomplete notes available here.
2011-07-16 00:28:04 +02:00
20a6f210cd flashsvenc: drop unnecessary cast 2011-07-16 00:27:15 +02:00
0686515cb4 flashsvenc: improve some variable names and fix corresponding comments 2011-07-16 00:27:15 +02:00
59ef6bded5 flashsvenc: merge two consecutive if-conditions 2011-07-16 00:27:12 +02:00
12e9bf3e84 flashsvenc: merge variable declarations and initializations 2011-07-16 00:26:19 +02:00
b88523c25d flashsvenc: convert some debug av_log() to av_dlog() 2011-07-16 00:26:18 +02:00
3d5669c6e9 flashsvenc: whitespace cosmetics 2011-07-16 00:26:18 +02:00
4877356d8f flashsvenc: drop some unnecessary parentheses 2011-07-16 00:26:17 +02:00
36ba39d140 flashsvenc: fix some comment typos 2011-07-16 00:26:15 +02:00
ce5e49b0c2 replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_* 2011-05-02 16:41:41 +02:00
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
3788a3c0c0 Merge remote branch 'qatar/master'
* qatar/master:
  graphparser: add a NULL check on the argument passed to strstr
  setdar: prefer "sar" over "par" in log info message
  fade: fix draw_slice() check on fade->factor value
  fade: make draw_slice() chroma check against planes 1 and 2
  win32: include the correct header in cmdutils.c
  ac3: fix memleak in fixed-point encoder
  flashsv: Return more meaningful error values.
  flashsv: Employ explicit AVCodec struct initializers.
  read AVI palette from the end of extradata
  cosmetics: K&R coding style and more whitespace for Flash Screen Video

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-26 04:21:15 +02:00
a14c08247d flashsv: Return more meaningful error values. 2011-04-25 16:01:58 +02:00
46cb2da1f0 flashsv: Employ explicit AVCodec struct initializers. 2011-04-25 15:41:10 +02:00
293fe6da01 cosmetics: K&R coding style and more whitespace for Flash Screen Video 2011-04-25 01:50:07 +02:00
2912e87a6c Replace FFmpeg with Libav in licence headers
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
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
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
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
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
4a49ab77c6 Remove unnecessary calls to avcodec_check_dimensions, the check is already
done at a higher level.

Originally committed as revision 20229 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-13 20:13:28 +00:00
2ba8301769 Mark all pix_fmts and supported_framerates compound literals as const.
Makes no difference for gcc but at least icc can put them in .rodata then.

Originally committed as revision 19789 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-06 16:09:21 +00:00
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
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
fe4bf37455 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
Originally committed as revision 13759 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-12 21:50:13 +00:00
eacced45c4 Replace some occurrences of -1 with PIX_FMT_NONE.
Fixes icc warning #188: enumerated type mixed with another type

Originally committed as revision 13130 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-11 22:28:43 +00:00
d5202e4fda Add long names to many AVCodec declarations.
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13005 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-27 10:52:44 +00:00
98a6fff98c Apply 'cold' attribute to init/uninit functions in libavcodec
Originally committed as revision 12525 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 03:11:20 +00:00
c17a53b71f Use FFABS instead of abs.
Originally committed as revision 9045 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-17 11:03:43 +00:00
54353abef2 Remove lots of unused commented code. (Cleanup)
Originally committed as revision 9041 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-17 07:50:08 +00:00
3bcb658c36 Change default 1 pass blocksize to 64x64.
Originally committed as revision 9040 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-17 07:47:02 +00:00
d2bc04738b Added support for instances where linesize[0] is negative.
Based on patch by Jason Askew, jason dot askew at gmail dot com.

Originally committed as revision 9006 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-12 19:37:26 +00:00
2029f312e8 Remove redundant #inclusion of common.h, avcodec.h already #includes it.
Originally committed as revision 8967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-10 09:00:44 +00:00
e4141433ea Get rid of unnecessary pointer casts.
patch by Nicholas Tung, ntung ntung com

Originally committed as revision 8687 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-08 20:24:16 +00:00
8736d68a80 Respect the gop size (-g) for marking I frames. Use -g 0 gives the old behaviour.
Originally committed as revision 8326 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-11 21:01:33 +00:00
64472fcff1 Simplify, use avctx->frame_number.
Originally committed as revision 8309 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-10 09:20:07 +00:00
b6607559af Don't copy more then needed, bugfix by Gus Scheidt ellocogato at gmail dot com and Michel Bardiaux mbardiaux at mediaxim dot be.
Originally committed as revision 7702 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-25 08:21:02 +00:00
21f6aa108f Remove debug line.
Originally committed as revision 7621 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 21:25:16 +00:00
8adc51f2ad Add flashsv encoder to changelog and fix the encoder so it actually works.
Originally committed as revision 7620 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 21:24:05 +00:00
053185c2fa Flash screen video encoder.
Originally committed as revision 7615 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 20:56:20 +00:00