ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-23 06:46:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,902 Commits 36 Branches 398 Tags 535 MiB
7ce011e054
Commit Graph

53902 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
21bf0d6f80 avformat/network: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 14:29:04 +02:00
Michael Niedermayer
856e7dbb72 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  apetag: use int64_t for filesize

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 12:25:16 +02:00
Michael Niedermayer
4abd5a4318 Merge commit '274e134e49b1c92db0f0b8cb2ae7554fb7b9184c' 
* commit '274e134e49b1c92db0f0b8cb2ae7554fb7b9184c':
  avconv: check that the output format context exists before accessing it

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 12:20:26 +02:00
Michael Niedermayer
2280b539c5 Merge commit '8b7dffc2d6c6c19f8e0a1fedcd0e95dce7a273ff' 
* commit '8b7dffc2d6c6c19f8e0a1fedcd0e95dce7a273ff':
  lavfi doxy: improve/extend AVFilter doxy.

Conflicts:
	libavfilter/avfilter.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 12:05:41 +02:00
Michael Niedermayer
82070b01b8 Merge commit '9835abb6d63fb07613994ae90e72fef758149408' 
* commit '9835abb6d63fb07613994ae90e72fef758149408':
  network: uniform ff_listen_bind and ff_listen_connect

Conflicts:
	libavformat/network.c
	libavformat/tcp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 11:56:56 +02:00
Michael Niedermayer
606e8baf0f Merge commit '7c020e1ad37d27c9d5db4d714401f09c80e3cc44' 
* commit '7c020e1ad37d27c9d5db4d714401f09c80e3cc44':
  movenc: Grow the frag_info array in chunks

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 11:33:25 +02:00
Michael Niedermayer
28ce9c0b73 Merge commit 'ab1189766a82a95f108005463cde75f73fcc0ae5' 
* commit 'ab1189766a82a95f108005463cde75f73fcc0ae5':
  movenc: Increase the cluster array allocation by doubling

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 11:26:32 +02:00
Michael Niedermayer
30b491f1c9 Merge commit '3b4feac1ec14f861bdd7f494f288f4d8dd7f449e' 
* commit '3b4feac1ec14f861bdd7f494f288f4d8dd7f449e':
  movenc: Keep track of the allocated size for the cluster array
  mem: Add av_realloc_array and av_reallocp_array

Conflicts:
	doc/APIchanges
	libavformat/movenc.c
	libavutil/mem.c
	libavutil/mem.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 11:19:16 +02:00
Timothy Gu
ea038b996d doc/encoders: add documentation for libtwolame 2013-06-05 08:33:13 +00:00
Michael Niedermayer
3289670142 swr: dont treat 32 and 24 as equal in simple copy check 
Fixes dithering from 32 to 24 bit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 03:06:34 +02:00
Michael Niedermayer
6bc4e36ba7 swr: set scale for 32->32/24 dither 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 03:06:34 +02:00
Stefano Sabatini
449558d34a lavfi/mp: remove mp=sab 
The filter was ported to a native libavfilter filter.
 2013-06-05 00:06:51 +02:00
Stefano Sabatini
841df7bf86 lavfi: port sab filter from libmpcodecs 2013-06-05 00:06:51 +02:00
Paul B Mahol
0804171104 swresample: set flags & description and add documentation for output_sample_bits 
Allows users to actually use such option.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-04 21:57:25 +00:00
Michael Niedermayer
495bf1b685 swr: Fix dithering of s16 with SIMD 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-04 23:50:45 +02:00
Michael Niedermayer
4cfc92081d swr: add native_simd_one 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-04 23:50:45 +02:00
Paul B Mahol
e3e398b80b doc/general: update after e4e4add0e3 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-04 21:43:59 +00:00
Michael Niedermayer
3b58ab4c5f pngdec: dont treat mpng like png with key and non keyframes 
Fixes Ticket2618

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-04 20:40:07 +02:00
Carl Eugen Hoyos
3b491c5a50 Use av_log() instead of fprintf() in ffplay. 
Fixes ticket #2630.

Reviewed-by: Marton Balint
 2013-06-04 19:47:56 +02:00
Paul B Mahol
f5d5bc3493 tak: simplify ff_tak_check_crc() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-04 17:25:32 +00:00
Anton Khirnov
e816aaacd6 apetag: use int64_t for filesize 
CC: libav-stable@libav.org
 2013-06-04 17:20:19 +02:00
Anton Khirnov
274e134e49 avconv: check that the output format context exists before accessing it 
Fixes a segfault in exit_program() if opening an output file fails.
 2013-06-04 17:20:04 +02:00
Anton Khirnov
8b7dffc2d6 lavfi doxy: improve/extend AVFilter doxy. 2013-06-04 17:18:33 +02:00
Michael Niedermayer
b84de51f54 swresample/rematrix: add S32 mixing code 
Needed for dithering S32

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-04 15:12:11 +02:00
Michael Niedermayer
f3c638eac1 wresample/rematrix_template: fix internal types 
Should make no difference, but future commits will need it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-04 15:12:11 +02:00
Luca Barbato
9835abb6d6 network: uniform ff_listen_bind and ff_listen_connect 
Document the functions and have both use a millisecond timeout and
check for interrupt.
 2013-06-04 14:56:52 +02:00
Andrey Semashev
7c020e1ad3 movenc: Grow the frag_info array in chunks 
Previously it was grown one element at a time, which leads to
excessive reallocations.

Bug-Id: 525
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-06-04 15:05:42 +03:00
Andrey Semashev
ab1189766a movenc: Increase the cluster array allocation by doubling 
The previous allocation increment of 16384 meant that the cluster
array was allocated for 0.6 MB initially, which is a bit excessive
for cases with fragmentation where only a fraction of that ever
actually is used.

Therefore, start off at a much smaller value, and increase by
doubling (to avoid reallocating too often when writing long
non-fragmented mp4 files).

Bug-Id: 525
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-06-04 15:05:31 +03:00
Andrey Semashev
3b4feac1ec movenc: Keep track of the allocated size for the cluster array 
When writing fragmented mp4, the cluster array is reset when a
fragment is written. Instead of starting off reallocating the
array only based on the number of current elements in it, keep
track of how many elements there were allocated earlier.

This avoids reallocating this array needlessly when writing
fragmented mp4 files.

Bug-Id: 525
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-06-04 15:05:12 +03:00
Martin Storsjö
fc962d4e7a mem: Add av_realloc_array and av_reallocp_array 
These help avoiding overflows and simplify error handling.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-06-04 15:04:08 +03:00
Michael Niedermayer
372e00793f Merge remote-tracking branch 'lukaszmluki/master' 
* lukaszmluki/master:
  ftp: fix using uninitialized value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-04 13:56:07 +02:00
Michael Niedermayer
2192f89368 ffserver: fix null pointer dereference 
Fixes CID732208
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-04 13:19:27 +02:00
Lukasz Marek
7faafe606f ftp: fix using uninitialized value 
Fix coverity issue CID 1026777

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2013-06-04 13:08:23 +02:00
Michael Niedermayer
fca435fee1 vc1dec: Disable dead code 
Fixes CID732197/6

A assert is added to check that the disabled code wont
be needed in the future.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-04 02:43:20 +02:00
Paul B Mahol
d19d679e4b lavf/aacdec: add support for reading ape tags 
Closes #2634.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-03 23:10:57 +00:00
Paul B Mahol
55121f3fa9 tta: add support for reading ape tags 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-03 23:04:43 +00:00
Paul B Mahol
0e84ba747e tta: return meaningful error codrs 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-03 22:26:16 +00:00
Paul B Mahol
b4d4ef5529 flacdec: use init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-03 19:24:15 +00:00
Michael Niedermayer
e4bf3a97de Merge branch 'master' of https://github.com/upsuper/ffmpeg-vdadec 
* 'master' of https://github.com/upsuper/ffmpeg-vdadec:
  vda_h264_dec: remove check_format

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 20:21:01 +02:00
Michael Niedermayer
c8faa47484 avformat/network: check the return value from setsockopt() 
Fixes: CID1026742
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 16:12:00 +02:00
Michael Niedermayer
2fe4b6210c matroskadec: fix memleak of pkt_data 
Fixes: CID1026767
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 16:08:38 +02:00
Michael Niedermayer
0722b4d08c matroskadec: favor av_freep() 
av_freep() is safer as it zeros the pointer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 16:05:09 +02:00
Michael Niedermayer
43487bc5c1 avfilter/vf_mcdeint: free frame on error 
Fixes CID1026766
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 15:41:29 +02:00
Michael Niedermayer
3ed56b3b39 avfilter/process_options: fix memleak 
Fixes CID1026765
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 15:26:50 +02:00
Michael Niedermayer
7e7d090907 avfilter/af_astats: rename stat() 
See CID1026741
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 14:59:52 +02:00
Michael Niedermayer
bbae652113 tiff: fix memleak 
Fixes CID1026764
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 14:59:52 +02:00
Michael Niedermayer
bbf43c70dd jpeg2000dec: assert that curtileno is valid when used 
Fixes CID1026755
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 14:59:52 +02:00
Michael Niedermayer
234f76ae7d jpeg2000: Fix unintended sign extension in malloc arguments of prec 
Fixes: CID1026772/3
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 14:59:40 +02:00
Michael Niedermayer
d8c10324ed jpeg2000: Fix Unintended sign extension in malloc arguments of cblk. 
Fixes CID1026770
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 14:16:19 +02:00
Michael Niedermayer
6952e2f82a h264_ps: fix memleak in ff_h264_decode_picture_parameter_set() 
Fixes: CID1026763
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 14:09:12 +02:00