virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity
51,416 Commits 37 Branches 400 Tags 458 MiB
e0dd8cadcc
Commit Graph

45 Commits

Author SHA1 Message Date
Michael Niedermayer
6f9ae391de faxcompr: Dont read ref when the end has been reached in pass mode 
Fixes reading over the end

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-12 22:55:44 +01:00
Michael Niedermayer
98b7a50a21 tiffdec: Fix runend handling 
Fixes Ticket1999

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-24 04:35:12 +01:00
Michael Niedermayer
5891e454a6 faxcompr: fix out of array read 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-07 12:36:00 +02:00
Michael Niedermayer
438b86fed4 faxcompr: fix byte alignment case 
Fixes Ticket1653

Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-30 22:24:58 +02:00
Michael Niedermayer
3a1ca240d9 ccitt fax: fix some group3 1d files without EOL 
Fixes Ticket832

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-17 02:58:41 +02:00
Michael Niedermayer
367d9b2957 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  swscale: K&R formatting cosmetics (part II)
  tiffdec: Add a malloc check and refactor another.
  faxcompr: Check malloc results and unify return path
  configure: escape colons in values written to config.fate
  ac3dsp: call femms/emms at the end of float_to_fixed24() for 3DNow and SSE
  matroska: Fix leaking memory allocated for laces.
  pthread: Fix crash due to fctx->delaying not being cleared.
  vp3: Assert on invalid filter_limit values.
  h264: fix 10bit biweight functions after recent x86inc.asm fixes.
  ffv1: Fix size mismatch in encode_line.
  movenc: Remove a dead initialization
  git-howto: Explain how to avoid Windows line endings in git checkouts.
  build: Move all arch OBJS declarations into arch subdirectory Makefiles.

Conflicts:
	configure
	libavcodec/vp3.c
	libavformat/matroskadec.c
	libavutil/Makefile
	libswscale/Makefile
	libswscale/swscale.c
	libswscale/swscale_internal.h
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-13 21:50:37 +02:00
Alex Converse
99a335299f faxcompr: Check malloc results and unify return path 2012-04-13 09:49:13 -07:00
Michael Niedermayer
6cb2085278 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (27 commits)
  ppc: Add ff_ prefix to nonstatic symbols
  sh4: Add ff_ prefix to nonstatic symbols
  mpegvideo: Add ff_ prefix to nonstatic functions
  rtjpeg: Add ff_ prefix to nonstatic symbols
  rv: Add ff_ prefix to nonstatic symbols
  vp56: Add ff_ prefix to nonstatic symbols
  vorbis: Add ff_ prefix to nonstatic symbols
  msmpeg4: Add ff_ prefix to nonstatic symbols
  vc1: Add ff_ prefix to nonstatic symbols
  msmpeg4: Add ff_ prefixes to nonstatic symbols
  snow: Add ff_ prefix to nonstatic symbols
  mpeg12: Add ff_ prefix to nonstatic symbols
  mpeg4: Add ff_ prefixes to nonstatic symbols
  lagarith: Add ff_ prefix to lag_rac_init
  libavcodec: Add ff_ prefix to j_rev_dct*
  dsputil: Add ff_ prefix to inv_zigzag_direct16
  libavcodec: Prefix fdct_ifast, fdct_ifast248
  dsputil: Add ff_ prefix to the dsputil*_init* functions
  libavcodec: Add ff_ prefix to some nonstatic symbols
  vlc/rl: Add ff_ prefix to the nonstatic symbols
  ...

Conflicts:
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/dnxhddec.c
	libavcodec/ffv1.c
	libavcodec/h263.h
	libavcodec/h263dec.c
	libavcodec/h264.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/nuv.c
	libavcodec/ppc/dsputil_ppc.c
	libavcodec/proresdsp.c
	libavcodec/svq3.c
	libavcodec/version.h
	libavformat/dv.h
	libavformat/dvenc.c
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-16 01:34:37 +01:00
Martin Storsjö
e96b4a53df vlc/rl: Add ff_ prefix to the nonstatic symbols 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-15 22:06:26 +02:00
Michael Niedermayer
042f9d62ca Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: Automatically add more flags required on symbian
  mem.h: switch doxygen parameter order to match function prototype
  doxygen: replace @sa tag by the more readable but equivalent @see
  doxygen: use Doxygen markup for authors and web links where appropriate
  doxygen: do not include license boilerplate in Doxygen documentation
  ac3enc: Mark AVClasses const
  ffserver: Replace two loops with one loop.
  ffmpeg: Fix the check for experimental codecs
  swscale: extend mmx padding.
  swscale: clip unscaled colorspace conversion path.
  doxygen: misc consistency cosmetics
  doc: remove file name from @file directive in Doxygen usage example
  doxygen: consistently place brief description
  doxygen: place empty line between brief description and detailed description
  avformat_open_input(): Add braces to shut up gcc warning.

Conflicts:
	libavcodec/8svx.c
	libavcodec/tiff.c
	libavcodec/tiff.h
	libavcodec/vaapi_h264.c
	libavcodec/vorbis.c
	libavcodec/vorbisdec.c
	libavcodec/vp6.c
	libswscale/swscale_unscaled.c
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-15 17:51:09 +02:00
Diego Biurrun
f6f95d4e49 doxygen: consistently place brief description 2011-07-14 20:49:37 +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
Reimar Döffinger
badce93dad Simplify r20025: use align_get_bits instead of reimplementing it. 
Originally committed as revision 20079 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-29 11:06:04 +00:00
Kostya Shishkov
a5568f4608 Make sure all the bits are written to output in fax data decoder. 
This fixes decoding TIFF images with fax compression and width being not
multiple of eight (and issue 1429).

Originally committed as revision 20072 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-29 05:55:14 +00:00
Kostya Shishkov
d2cdf20147 cosmetics: reindent and reformat function declarations 
Originally committed as revision 20066 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-28 05:19:13 +00:00
Kostya Shishkov
8da5d3dc37 Finally distinguish TIFF_CCITT_RLE and TIFF_G3 1-D case, so both of them 
will be decoded correctly.
This fixes issue 1423.

Originally committed as revision 20065 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-28 05:17:20 +00:00
Kostya Shishkov
a8c7a3d2c1 Fix decoding of TIFF CCITT RLE compressed data. 
This fixes issue 1417.

Originally committed as revision 20025 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-26 05:48:50 +00:00
Stefano Sabatini
9106a698e7 Rename bitstream.h to get_bits.h. 
Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-13 16:20:26 +00:00
Stefano Sabatini
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
Diego Biurrun
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
Diego Biurrun
dc8a7c93d3 Add missing void keyword to parameterless function declarations. 
Originally committed as revision 16860 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-30 18:38:25 +00:00
Michael Niedermayer
a56f82eaf8 indent 
Originally committed as revision 16348 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-26 18:39:24 +00:00
Michael Niedermayer
537bf4266f Simplify vertical mode 
Originally committed as revision 16347 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-26 18:39:07 +00:00
Michael Niedermayer
eb0094b224 And another sechole ... 
Originally committed as revision 16346 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-26 18:14:59 +00:00
Michael Niedermayer
268309750b Fix yet another sechole. 
Originally committed as revision 16345 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-26 18:06:29 +00:00
Michael Niedermayer
11c5999e20 Fix another sechole. 
Originally committed as revision 16344 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-26 17:51:10 +00:00
Michael Niedermayer
2a522579aa Minor simplification. 
Originally committed as revision 16343 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-26 17:32:11 +00:00
Michael Niedermayer
f78a679177 Remove unused run_start variable. 
Originally committed as revision 16342 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-26 17:11:19 +00:00
Michael Niedermayer
6f5c00eb9f Move sync line pointers code to the end of the loop, it is simpler that way. 
Originally committed as revision 16341 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-26 17:04:31 +00:00
Michael Niedermayer
e3a54b6694 Get rid of check for condition that is always true (run_off < avctx->width). 
Originally committed as revision 16340 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-26 16:59:10 +00:00
Michael Niedermayer
43ba8f3545 Get rid of pix_left in the 2d code, it is simpler that way. 
Originally committed as revision 16339 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-26 16:57:35 +00:00
Michael Niedermayer
6fe68c7b97 Factorize "avctx->width + 2" out to avoid someone mistakenly changing 
some but not all.

Originally committed as revision 16336 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-26 16:38:55 +00:00
Michael Niedermayer
621e6525a6 cosmetic (moving pix_left update) 
Originally committed as revision 16335 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-26 16:30:50 +00:00
Michael Niedermayer
1d7985072c Close gaping sechole. That is, a series of run=0 allows arbitrary data to 
be written over the end of the runs array.

Originally committed as revision 16334 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-26 16:29:01 +00:00
Michael Niedermayer
d02ab57a5f minor simplification 
Originally committed as revision 16333 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-26 15:21:48 +00:00
Michael Niedermayer
66909bc4f1 Merge ff_ccitt_unpack_1d and 2d. 
Originally committed as revision 16332 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-26 15:05:12 +00:00
Michael Niedermayer
d68542f019 Ensure that an invalid run terminates the line. 
Originally committed as revision 16331 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-26 14:57:42 +00:00
Michael Niedermayer
ec5bdf4989 10l != vs. == (yes, my fault not kostya's). 
Originally committed as revision 16330 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-26 14:39:21 +00:00
Michael Niedermayer
679f3fa901 indent 
Originally committed as revision 16329 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-26 13:52:07 +00:00
Michael Niedermayer
68d48cc592 Simplify zero run handling in put_line(). 
Originally committed as revision 16328 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-26 13:51:52 +00:00
Michael Niedermayer
bc0f7a9c75 Avoid negation in put_line(). 
Originally committed as revision 16327 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-26 13:50:00 +00:00
Michael Niedermayer
4e60b64324 Factorize mode switching in put_line(). 
Originally committed as revision 16326 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-26 13:48:09 +00:00
Michael Niedermayer
eb12536a31 Fix (rewrite) find_group3_syncmarker(). 
Originally committed as revision 16325 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-26 13:46:11 +00:00
Michael Niedermayer
8d48db314e CCITT Fax Group 3 and 4 decompression by kostya. 
Will be activated after a little more reviewing and fixing by me.
Commited now, so as to not lose history of that.

Originally committed as revision 16323 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-26 13:39:19 +00:00