generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
36,190 Commits 24 Branches 241 Tags 173 MiB
084bd109fc
Commit Graph

27 Commits

Author SHA1 Message Date
Michael Niedermayer
d1c28e3530 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  build: fix standalone compilation of OMA muxer
  build: fix standalone compilation of Microsoft XMV demuxer
  build: fix standalone compilation of Core Audio Format demuxer
  kvmc: fix invalid reads
  4xm: Add a check in decode_i_frame to prevent buffer overreads
  adpcm: fix IMA SMJPEG decoding
  options: set minimum for "threads" to zero
  bsd: use number of logical CPUs as automatic thread count
  windows: use number of CPUs as automatic thread count
  linux: use number of CPUs as automatic thread count
  pthreads: reset active_thread_type when slice thread_init returrns early
  v410dec: include correct headers
  Drop ALT_ prefix from BITSTREAM_READER_LE name.
  lavfi: always build vsrc_buffer.
  ra144enc: zero the reflection coeffs if the filter is unstable
  sws: readd PAL8 to isPacked()
  mov: Don't stick the QuickTime field ordering atom in extradata.
  truespeech: fix invalid reads in truespeech_apply_twopoint_filter()

Conflicts:
	configure
	libavcodec/4xm.c
	libavcodec/avcodec.h
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavformat/Makefile
	libswscale/swscale_internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-23 03:25:51 +01:00
Diego Biurrun
aaf47bcde7 Drop ALT_ prefix from BITSTREAM_READER_LE name. 
The prefix is a historic remnant that probably meant "alternative".
Now that the A32 bitstream reader has been dropped it makes no sense anymore.
 2011-12-22 16:51:23 +01:00
Michael Niedermayer
99eb31e263 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (25 commits)
  Replace custom DEBUG preprocessor trickery by the standard one.
  vorbis: Remove non-compiling debug statement.
  vorbis: Remove pointless DEBUG #ifdef around debug output macros.
  cook: Remove non-compiling debug output.
  Remove pointless #ifdefs around function declarations in a header.
  Replace #ifdef + av_log() combinations by av_dlog().
  Replace custom debug output functions by av_dlog().
  cook: Remove unused debug functions.
  Remove stray extra arguments from av_dlog() invocations.
  targa: fix big-endian build
  v4l2: remove one forgotten use of AVFormatParameters.pix_fmt.
  vfwcap: add a framerate private option.
  v4l2: add a framerate private option.
  libdc1394: add a framerate private option.
  fbdev: add a framerate private option.
  bktr: add a framerate private option.
  oma: check avio_read() return value
  nutdec: remove unused variable
  Remove unused variables
  swscale: allocate larger buffer to handle altivec overreads.
  ...

Conflicts:
	ffmpeg.c
	libavcodec/dca.c
	libavcodec/dirac.c
	libavcodec/error_resilience.c
	libavcodec/h264.c
	libavcodec/mpeg12.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pthread.c
	libavcodec/rv10.c
	libavcodec/s302m.c
	libavcodec/shorten.c
	libavcodec/truemotion2.c
	libavcodec/utils.c
	libavdevice/dv1394.c
	libavdevice/fbdev.c
	libavdevice/libdc1394.c
	libavdevice/v4l2.c
	libavformat/4xm.c
	libavformat/apetag.c
	libavformat/asfdec.c
	libavformat/avidec.c
	libavformat/mmf.c
	libavformat/mpeg.c
	libavformat/mpegenc.c
	libavformat/mpegts.c
	libavformat/oggdec.c
	libavformat/oggparseogm.c
	libavformat/rl2.c
	libavformat/rmdec.c
	libavformat/rpl.c
	libavformat/rtpdec_latm.c
	libavformat/sauce.c
	libavformat/sol.c
	libswscale/utils.c
	tests/ref/vsynth1/error
	tests/ref/vsynth2/error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-03 05:19:30 +02:00
Diego Biurrun
f190f676bc Replace custom DEBUG preprocessor trickery by the standard one. 2011-06-03 00:44:06 +02:00
Stefano Sabatini
01042d4123 lavc: set defaults in internal codec frames 
This is required specifically for setting frame->format to -1,
otherwise it will be set to 0 = PIX_FMT_YUV420P and code reading
the format from the output decoded frame will get misled.

In particular fix regressions occurring with the pending vsrc_buffer
patch.
 2011-05-07 12:03:59 +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 Elio Pettenò
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
Diego Elio Pettenò
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
Diego Biurrun
0c733da8e2 Fix Doxygen @param command attribute syntax. 
The [in] and [out] attributes have to be appended to the @param command.

Originally committed as revision 24283 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-17 10:43:42 +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
Maxim Poliakovski
07ff7825b6 Move indeo5-specific quant table selection to decode_gop_hdr. 
Originally committed as revision 23581 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-11 09:49:06 +00:00
Maxim Poliakovski
411e859bce Remove unused parameter. 
Originally committed as revision 23563 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-10 16:52:54 +00:00
Maxim Poliakovski
9c6b3b97d7 Add the forgotten ff_ prefix to the shareable scan patterns. 
Originally committed as revision 23341 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-26 20:22:29 +00:00
Maxim Poliakovski
220f2bd9c5 move indeo5 scan patterns into ivi_common.c 
so those can be shared by indeo4.

Originally committed as revision 23335 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-26 13:25:16 +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
Stefano Sabatini
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
Maxim Poliakovski
ace38c36bf Correct reference buffer switching in Indeo 5 decoder. 
Patch by Maxim ($indeo5decauthor)

Originally committed as revision 22580 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-17 07:53:12 +00:00
Kostya Shishkov
6eec969d54 document two variables in Indeo5 decoding context 
Originally committed as revision 22579 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-17 07:49:36 +00:00
Maxim Poliakovski
b5852e8a4d Make Indeo 5 decoder more robust on bitstream errors. 
Patch by Maxim ($indeo5dec_author)

Originally committed as revision 22319 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 06:52:33 +00:00
Maxim Poliakovski
7fcb98a7ec Band quant tables should not be assigned inside band tile loop, 
one time is enough.
Patch by Maxim (max_pole, gmx de)

Originally committed as revision 22279 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-07 12:12:42 +00:00
Kostya Shishkov
e322aacedd Encapsulate VLC information needed for decoding blocks and macroblocks in 
Indeo 5 into single structure IVIHuffTab and factorize code using it.

Based on patch by Maxim (max_pole at German GMX)

Originally committed as revision 22092 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-27 12:32:31 +00:00
Kostya Shishkov
60819e694e 10l trocadero: Indeo 5 decoder did not free custom VLCs for macroblock and 
block decoding at exit, so prevent that memory leak now.

Originally committed as revision 21983 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 07:41:29 +00:00
Kostya Shishkov
9068f36dcc Macroblock and block Huffman code sets are to be used by both Indeo 4 and 
Indeo 5, so make them global and move their initialization to the common place
as well. And fix static VLC initialization, as ff_ivi_create_huff_from_desc()
used old way to do so.

Originally committed as revision 21962 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-22 13:51:32 +00:00
Stefan Gehrer
cc01ab903e remove ivi5_scans8x8[0], it duplicates ff_zigzag_direct 
Originally committed as revision 21897 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-19 17:17:20 +00:00
Kostya Shishkov
94dde5c1ec Move 'chksum' declaration to the only block where that variable is used 
Originally committed as revision 21753 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-11 07:59:24 +00:00
Kostya Shishkov
f7d649185b Move band checksum verifying into preprocessor condition, so compiler won't 
complain about missing function prototype.

Originally committed as revision 21752 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-11 07:54:40 +00:00
Kostya Shishkov
5bebe94d86 Indeo 5 decoder 
Originally committed as revision 21695 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-09 07:55:07 +00:00