generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
62,349 Commits 24 Branches 241 Tags 173 MiB
6db42a2b6b
Commit Graph

62349 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
44841528c1 avcodec/mpegaudioenc_template: reorder operations to prevent integer overflow 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 07:04:12 +02:00
Michael Niedermayer
9d66aa2c8f avcodec/mpegaudioenc_template: dont crash on bitrate=0 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 05:16:52 +02:00
Michael Niedermayer
d98688efb1 swscale/input: replace assert() by av_assert1() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 05:14:34 +02:00
Michael Niedermayer
624327988f Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doc: Completely document the x264 options

Conflicts:
	doc/encoders.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 04:54:26 +02:00
Michael Niedermayer
43935842bd Merge commit '0d671ade99059fd47b155df85c10c35eb6d54878' 
* commit '0d671ade99059fd47b155df85c10c35eb6d54878':
  doc: Use a 3 columns multitable

Conflicts:
	doc/encoders.texi

No change as we dont use a multitable for this list
we could of course switch to one though if it looks better
comments welcome

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 04:49:15 +02:00
Michael Niedermayer
8f23045b16 Merge commit 'be59675add2a05a7400b1abf86201ab069d7b1dd' 
* commit 'be59675add2a05a7400b1abf86201ab069d7b1dd':
  doc: Change the multitable rendering in texi2pod

Conflicts:
	doc/texi2pod.pl

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 04:26:20 +02:00
Michael Niedermayer
e40d92b1e4 Merge commit '59388dac69f9a79eddb003d1c6aad5ec89d4287b' 
* commit '59388dac69f9a79eddb003d1c6aad5ec89d4287b':
  fate: update tests for YVYU422 pixel format

Conflicts:
	tests/ref/fate/filter-pixdesc
	tests/ref/fate/filter-pixfmts-copy
	tests/ref/fate/filter-pixfmts-null
	tests/ref/fate/filter-pixfmts-scale
	tests/ref/fate/filter-pixfmts-vflip

No change as the fate tests where updated in the merges that changed
the scores

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 04:16:35 +02:00
Michael Niedermayer
233dbee3bc Merge commit 'b6a09ef700786b4e1e871dfa0f5c386ea43bbd0a' 
* commit 'b6a09ef700786b4e1e871dfa0f5c386ea43bbd0a':
  rawvideo: Support decoding YVYU422 FourCC

See: ab7d6cb8f7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 04:06:35 +02:00
Michael Niedermayer
ed962414bd Merge commit '92b099daf4b8ef93513e38b43899cb8458a2fde3' 
* commit '92b099daf4b8ef93513e38b43899cb8458a2fde3':
  swscale: support converting YVYU422 pixel format

Conflicts:
	libswscale/input.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 03:36:38 +02:00
Michael Niedermayer
0a1cc04e6c Merge commit '8b17243d1742279bcb2368f8d325ea71e66736c8' 
* commit '8b17243d1742279bcb2368f8d325ea71e66736c8':
  lavu: Add packed YVYU422 pixel format

Conflicts:
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 03:07:47 +02:00
Michael Niedermayer
352e13e2a9 Merge commit '46439e156219d27f059cf687743ba5aacf238b87' 
* commit '46439e156219d27f059cf687743ba5aacf238b87':
  mp2: match twolame default options

Not merged as the change breaks fate, also forcing resampling to specific sample rate
reduces quality, and would be like rescaling every movie to 1080.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 02:59:43 +02:00
Michael Niedermayer
6c019f05ed Merge commit '718907cd881a0b593264aed059c0e00da13f9e15' 
* commit '718907cd881a0b593264aed059c0e00da13f9e15':
  libtwolame MP2 encoding support

Conflicts:
	Changelog
	configure
	doc/general.texi
	libavcodec/Makefile
	libavcodec/libtwolame.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 02:17:56 +02:00
wm4
f6774f905f mpegvideo: operate with pointers to AVFrames instead of whole structs 
The most interesting parts are initialization in ff_MPV_common_init() and
uninitialization in ff_MPV_common_end().

ff_mpeg_unref_picture and ff_thread_release_buffer have additional NULL
checks for Picture.f, because these functions can be called on
uninitialized or partially initialized Pictures.

NULL pointer checks are added to ff_thread_release_buffer() stub function.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-04-09 02:12:19 +02:00
Vittorio Giovara
60fd7d36c4 fate: correctly set sample rate for mp2 tests 2014-04-09 02:11:25 +02:00
Michael Niedermayer
1752b1459d swscale/utils: scale filter_size in warning so that it can be used as max for the compile time define 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 00:57:12 +02:00
Michael Niedermayer
7b2b06eb43 swscale/utils: dont print message about filter size when the cause is a malloc failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 00:57:12 +02:00
Luca Barbato
e6e8be542b doc: Completely document the x264 options 
And fix an option mismatch.
 2014-04-08 23:24:42 +02:00
Luca Barbato
0d671ade99 doc: Use a 3 columns multitable 
Make the html output much nicer.
 2014-04-08 23:24:42 +02:00
Luca Barbato
be59675add doc: Change the multitable rendering in texi2pod 
Makes it working better for our documentation purposes.
 2014-04-08 23:24:42 +02:00
Vittorio Giovara
59388dac69 fate: update tests for YVYU422 pixel format 2014-04-08 23:24:41 +02:00
Vittorio Giovara
b6a09ef700 rawvideo: Support decoding YVYU422 FourCC 2014-04-08 23:24:36 +02:00
Michael Niedermayer
2daf580284 avcodec/j2kenc: use av_malloc(z)_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-08 23:12:26 +02:00
Michael Niedermayer
8ff061095f avcodec/libzvbi-teletextdec: remove * 1 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-08 23:12:26 +02:00
Michael Niedermayer
818aaa7636 avcodec/libopencore-amr: use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-08 23:12:26 +02:00
Anshul Maheshwari
5b30f27592 rtspcodes: don't check for >0 on error codes macro 
Avoids a warning with gcc 4.7 and -Wtype-limits. Albeit
superfluous (At least gcc 4.8 didnt consider this been
a problem).

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
 2014-04-08 18:05:02 -03:00
Schenk, Michael
358f9ae639 configure: AVI demux needs exif 
Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-08 20:14:49 +02:00
Michael Niedermayer
2fcef4a044 swscale/swscale_internal: remove obsolete warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-08 19:09:05 +02:00
Michael Niedermayer
955d7e26b6 swscale/swscale_internal: make the offset strings update themselfs when the MAX_FILTER_SIZE is changed 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-08 18:51:34 +02:00
Michael Niedermayer
f6759d9ad4 swscale/x86/swscale_template: loose hardcoded dstw_offset 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-08 18:39:39 +02:00
Michael Niedermayer
e20e854ca0 vcodec/bitstream: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-08 16:18:29 +02:00
Michael Niedermayer
33c9bb943b avcodec/avpacket: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-08 16:17:40 +02:00
Michael Niedermayer
e4c180c05a avcodec/a64multienc: use av_malloc(z)_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-08 16:15:32 +02:00
Michael Niedermayer
53487268e5 cmdutils: use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-08 15:44:32 +02:00
Michael Niedermayer
c8a1f10cf4 avcodec/ac3enc_float: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-08 15:35:47 +02:00
Michael Niedermayer
9b467d3cd5 examples/transcoding: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-08 15:35:14 +02:00
Michael Niedermayer
b176320545 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Fix compilation with --disable-everything --enable-decoder=rawvideo.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-08 02:29:06 +02:00
Michael Niedermayer
e36aaeca3a avfilter/vf_colormatrix: fix memleak on error 
Fixes CID1197065
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-08 01:25:00 +02:00
Michael Niedermayer
5027f39712 swresample/resample: use av_malloc_array() where appropriate 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-08 00:29:26 +02:00
Michael Niedermayer
a5290cb1ac swresample/dither: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-08 00:29:20 +02:00
Michael Niedermayer
f9158b01d0 swresample/resample: Limit filter length 
Related to CID1197063

The limit choosen is arbitrary and much larger than what makes sense.
It avoids the need for checking arithmetic operations with the length for overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-08 00:25:49 +02:00
Carl Eugen Hoyos
7fcb4f6c51 Fix compilation with --disable-everything --enable-decoder=rawvideo. 2014-04-08 00:04:25 +02:00
Vittorio Giovara
92b099daf4 swscale: support converting YVYU422 pixel format 2014-04-07 23:50:34 +02:00
Vittorio Giovara
8b17243d17 lavu: Add packed YVYU422 pixel format 2014-04-07 23:50:34 +02:00
Vittorio Giovara
46439e1562 mp2: match twolame default options 2014-04-07 23:50:33 +02:00
Paul B Mahol
718907cd88 libtwolame MP2 encoding support 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-04-07 23:50:33 +02:00
Michael Niedermayer
0d225863f2 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  libxvid: fix missing end of line character

Conflicts:
	libavcodec/libxvid.c

No change as the buggy modification wasnt merged, ffmpeg handles the
case where both lumi and variance masking are set, differently

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-07 20:53:34 +02:00
Carl Eugen Hoyos
836b60ce2b Fix standalone compilation of vp7 and vp8 decoder. 
Fixes ticket #3536.
 2014-04-07 15:30:48 +02:00
Carl Eugen Hoyos
993a5afaad Read aspect ratio from tiff image files. 2014-04-07 15:30:48 +02:00
Vittorio Giovara
17a75a8c09 libxvid: fix missing end of line character 
Error introduced in 5ce7ca68b8.
 2014-04-07 14:56:25 +02:00
Schenk, Michael
845414bbb1 avformat/oggdec: reset nstreams in close 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-07 14:55:35 +02:00