ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-10-05 20:43:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,814 Commits 37 Branches 400 Tags 497 MiB
f72b735d41
Commit Graph

45814 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul B Mahol
1470c8a9a3 takdec: remove redundant/wrong avio_tell() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-10 11:25:36 +00:00
Michael Niedermayer
50b5477616 Merge commit 'b94e4acb4874843e914fd3cb8e089aff0756bb4a' 
* commit 'b94e4acb4874843e914fd3cb8e089aff0756bb4a':
  cmdutils_read_file: increment *size after writing the trailing \0
  af_resample: unref out_buf when avresample_convert returns 0
  af_amix: prevent memory leak on error path
  vc1dec: prevent memory leak in error path
  vc1dec: prevent memory leak on av_realloc error
  af_channelmap: free old extended_data on reallocation
  avconv: simplify memory allocation in copy_chapters
  matroskaenc: check cue point validity before reallocation
  swfenc: error out for more than 1 audio or video stream
  build: link test programs only against static libs

Conflicts:
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-10 13:18:05 +02:00
Michael Niedermayer
eadba3e94d Merge commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f' 
* commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f':
  adxdec: use planar sample format
  adpcmdec: use planar sample format for adpcm_thp
  adpcmdec: use planar sample format for adpcm_ea_xas
  adpcmdec: use planar sample format for adpcm_ea_r1/r2/r3
  adpcmdec: use planar sample format for adpcm_xa
  adpcmdec: use planar sample format for adpcm_ima_ws for vqa version 3
  adpcmdec: use planar sample format for adpcm_4xm
  adpcmdec: use planar sample format for adpcm_ima_wav
  adpcmdec: use planar sample format for adpcm_ima_qt
  pcmdec: use planar sample format for pcm_lxf
  mace: use planar sample format
  atrac1: use planar sample format
  build: non-x86: Only compile mpegvideo optimizations when necessary
  rtpdec_mpeg4: au_headers is a single array, simple av_free is enough
  avcodec: free extended_data instead address of it
  fate: Add tests of the ff_make_absolute_url function
  url: Handle relative urls starting with two slashes
  url: Handle relative urls being just a new query string
  url: Don't treat slashes in query parameters as directory separators

Conflicts:
	libavcodec/adxdec.c
	libavcodec/mips/Makefile
	libavcodec/pcm.c
	libavcodec/utils.c
	libavformat/Makefile
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-10 13:01:27 +02:00
Mans Rullgard
4b895cb294 build: sanitize linking of tools and test programs 
This makes sure proper linker arguments are used for the tools and
test programs when shared libraries are enabled.  The tools are
linked using the usual -l flag while for test programs the full
name of the static library is used.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-10 11:24:09 +01:00
Diego Biurrun
096a5d76a5 fate: Refactor setting of environment variables for groups of tests 2012-10-10 10:49:51 +02:00
Paul B Mahol
b4e516e30e pcx: use meaningful return values 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-10 07:49:03 +00:00
Michael Niedermayer
25f44b041c x86/dsputil_mmx: change assert() to av_assert() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-10 04:49:41 +02:00
Diego Biurrun
6d0beefbf6 swscale: Do not make ff_ symbols globally visible. 2012-10-10 02:08:01 +02:00
Duncan Salerno
f3f35f7430 crypto should allow passing of options to the underlying protocol via the url_open2 interface 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-09 22:52:25 +02:00
Clément Bœsch
6ac5e3fe9d lavfi/silencedetect: add av_opt_free() call. 
This avoids a memleak with noise_str.
 2012-10-09 22:37:29 +02:00
Duncan Salerno
bd2f8e8f79 Fix second use of AVOptions in HLS 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-09 22:12:34 +02:00
Janne Grunau
d5ef9354ce rtspdec: use av_strlcpy for writing into fixed size buffer 
Fixes CID231347.
 2012-10-09 21:05:15 +02:00
Janne Grunau
f1de23faaa g722enc: fix size argument in memset 
Fixes CID700725.
 2012-10-09 21:05:15 +02:00
Janne Grunau
4a7c0c4555 http: use av_strlcpy instead of strcpy() without size checks 
Fixes CID700730.
 2012-10-09 21:05:14 +02:00
Janne Grunau
79e6e8eba2 avfilter: correct memcpy size avfilter_copy_buf_props() 
Does not make a difference in this case since sizeof(uint8_t*) ==
sizeof(uint8_t**). Fixes CID703814.
 2012-10-09 21:05:14 +02:00
Anton Khirnov
233a5a807e lavc: split asv12 encoder/decoder 2012-10-09 20:32:35 +02:00
Anton Khirnov
fb722a900f avconv: remove -same_quant 
It has not worked for anything other than fringe codecs (asv1/2, mdec,
mjpeg[b]) since about 2003 and nobody ever noticed or complained. This
sufficiently proves that there are no users of this option who have a
clue of what they are doing, so it is completely useless.
 2012-10-09 20:32:34 +02:00
Janne Grunau
b94e4acb48 cmdutils_read_file: increment *size after writing the trailing \0 
Fixes CID732166.
 2012-10-09 18:43:30 +02:00
Janne Grunau
ac9a89562a af_resample: unref out_buf when avresample_convert returns 0 
Fixes CID732273.
 2012-10-09 18:43:30 +02:00
Andrey Utkin
b6f435fbc8 http: add 'timeout' AVOption 
This option is passed though to underlying tcp protocol context

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-09 17:47:14 +02:00
Andrey Utkin
2e009c6042 tcp: accept params through avio_open2() options 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-09 17:24:55 +02:00
Andrey Utkin
949acefc11 tcp: use timeout option consistently 
Default _connection_ timeout value 5 seconds is left as i/o timeout also

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-09 17:18:43 +02:00
Andrey Utkin
d2b18c8f5b Introduce ff_network_wait_fd_timeout() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-09 17:17:05 +02:00
KO Myung-Hun
3a45688abc lavc: include os2threads.h in vp8.h if HAVE_OS2THREADS is enabled 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-09 16:55:36 +02:00
Anuj Mittal
8d2e0e2c70 Check for resync marker based on vop coding type- vop_fcode_forward and vop_fcode_backward L 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-09 16:48:51 +02:00
Anuj Mittal
ce19aec15b Check resync marker only when enabled. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-09 16:48:43 +02:00
Janne Grunau
8501c09868 af_amix: prevent memory leak on error path 
Fixes CID732272.
 2012-10-09 16:15:15 +02:00
Janne Grunau
6f8ef5320f vc1dec: prevent memory leak in error path 
Fixes CID732271.
 2012-10-09 16:09:41 +02:00
Janne Grunau
714f5ab597 vc1dec: prevent memory leak on av_realloc error 2012-10-09 16:07:12 +02:00
Janne Grunau
1afd7a118f af_channelmap: free old extended_data on reallocation 
Prevents writes to freed memory and the leak of the old extended data.
Fixes CID732303.
 2012-10-09 15:41:24 +02:00
Janne Grunau
18ff4d2020 avconv: simplify memory allocation in copy_chapters 
Make just a single reallocation per call instead of one reallocation
per copied chapters. This fixes possible memory leaks on realloc
failures. Also correct the allocation since it needs multiples of
sizeof(AVChapter*) and not sizeof(AVChapter).

Fixes CID700633 and CID700719.
 2012-10-09 15:39:05 +02:00
Janne Grunau
4ffbe3f3a5 matroskaenc: check cue point validity before reallocation 
Prevents memory leak and possible access to freed memory.
Fixes CID605744.
 2012-10-09 15:39:05 +02:00
Janne Grunau
53e122dd4a swfenc: error out for more than 1 audio or video stream 
Prevents CID602000.
 2012-10-09 15:39:05 +02:00
Mans Rullgard
0fb3b24ada build: link test programs only against static libs 
The test programs use internal symbols so cannot be linked against the
shared libs.  Linking against both shared and static is pointless and
might do something strange depending on the linker.  This changes the
dependencies so the test programs are linked only against the static
library for the component they belong to.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-09 14:16:21 +01:00
Justin Ruggles
cbcd497f38 adxdec: use planar sample format 2012-10-09 09:03:52 -04:00
Justin Ruggles
4ebd74cec7 adpcmdec: use planar sample format for adpcm_thp 2012-10-09 09:03:52 -04:00
Justin Ruggles
327cdb04e3 adpcmdec: use planar sample format for adpcm_ea_xas 2012-10-09 09:03:52 -04:00
Justin Ruggles
da9620e8e5 adpcmdec: use planar sample format for adpcm_ea_r1/r2/r3 2012-10-09 09:03:52 -04:00
Justin Ruggles
d2b6ae02aa adpcmdec: use planar sample format for adpcm_xa 2012-10-09 09:03:52 -04:00
Justin Ruggles
8b854283c3 adpcmdec: use planar sample format for adpcm_ima_ws for vqa version 3 2012-10-09 09:03:52 -04:00
Justin Ruggles
4356d66d78 adpcmdec: use planar sample format for adpcm_4xm 2012-10-09 09:03:52 -04:00
Justin Ruggles
1b9ac72908 adpcmdec: use planar sample format for adpcm_ima_wav 2012-10-09 09:03:52 -04:00
Justin Ruggles
176db0b892 adpcmdec: use planar sample format for adpcm_ima_qt 2012-10-09 09:03:52 -04:00
Justin Ruggles
7e5f045039 pcmdec: use planar sample format for pcm_lxf 2012-10-09 09:03:51 -04:00
Justin Ruggles
c1a9cfd1fe mace: use planar sample format 2012-10-09 09:03:51 -04:00
Justin Ruggles
23d53c5473 atrac1: use planar sample format 2012-10-09 09:03:51 -04:00
Diego Biurrun
ac56ff9cc9 build: non-x86: Only compile mpegvideo optimizations when necessary 2012-10-09 14:45:59 +02:00
Janne Grunau
8dd0650fe6 rtpdec_mpeg4: au_headers is a single array, simple av_free is enough 
Fixes CID700204.
 2012-10-09 14:24:36 +02:00
Janne Grunau
3fbda309e5 avcodec: free extended_data instead address of it 
Fixes CID732173.
 2012-10-09 14:04:46 +02:00
Martin Storsjö
7bc433b36d fate: Add tests of the ff_make_absolute_url function 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-10-09 14:16:34 +03:00