virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Code Issues Releases Activity
58,992 Commits 37 Branches 400 Tags 462 MiB
dee6d5f51c
Commit Graph

58992 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
dee6d5f51c Merge commit '17a10d51b8351ce9a57fcb6537b6a3c6ec8ba5e9' 
* commit '17a10d51b8351ce9a57fcb6537b6a3c6ec8ba5e9':
  hevc: set time_base when possible

See: f90281ca97
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 23:16:09 +01:00
Michael Niedermayer
12a4042445 Merge commit '33452aede6acab78f726cd1924824585f00765cc' 
* commit '33452aede6acab78f726cd1924824585f00765cc':
  hevc: store the VPS list as an AVBufferRef, just like the others *PS

Conflicts:
	libavcodec/hevc.c
	libavcodec/hevc_ps.c

See: 36658c978f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 23:08:45 +01:00
Michael Niedermayer
1dbb3cfa17 Merge commit 'b769cf4b44c8112827c2fdfcab74bd95600fd6d3' 
* commit 'b769cf4b44c8112827c2fdfcab74bd95600fd6d3':
  hevc: do not dereference pointer before NULL check in verify_md5()

See: f2eca8d060
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 23:03:01 +01:00
Michael Niedermayer
95ad2483c3 Merge commit '3bb91a1b5c4a0c5ec9c4d3b6649b23285c3d7f26' 
* commit '3bb91a1b5c4a0c5ec9c4d3b6649b23285c3d7f26':
  configure: Add -D__USE_MINGW_ANSI_STDIO=1 to CPPFLAGS on MinGW64

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 22:52:28 +01:00
Michael Niedermayer
37437d97a8 tools/probetest: Check av_realloc() return code 
Fixess CID1135761
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 22:29:22 +01:00
Michael Niedermayer
f6173fed60 postproc: fix null pointer dereference with invalid option strings 
Fixes CID1135760
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 22:28:42 +01:00
Michael Niedermayer
9ab5cf5417 avutil/avstring: fix () position 
Fixes CID1135751

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 21:13:51 +01:00
Guillaume Martres
17a10d51b8 hevc: set time_base when possible 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-12-11 20:39:54 +01:00
Gildas Cocherel
33452aede6 hevc: store the VPS list as an AVBufferRef, just like the others *PS 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-12-11 20:39:54 +01:00
Michael Niedermayer
b769cf4b44 hevc: do not dereference pointer before NULL check in verify_md5() 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-12-11 20:39:54 +01:00
Michael Niedermayer
81c1197494 avformat/utils: Check avcodec_open2() return code in av_find_stream_info() 
Fixes CID1135750

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 20:32:05 +01:00
Diego Biurrun
3bb91a1b5c configure: Add -D__USE_MINGW_ANSI_STDIO=1 to CPPFLAGS on MinGW64 
This enables a more POSIX-compliant printf implementation, that
allows using length modifiers like 'z'.
 2013-12-11 20:25:28 +01:00
Michael Niedermayer
6722e564a8 avformat/hdsenc: fix off by 1 error in array size check 
Fixes CID1135763, CID1135764

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 20:23:31 +01:00
Timothy Gu
d6c5fd9f15 tools/: Add gen-rc tool for generating Windows resource files 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 19:27:35 +01:00
Michael Niedermayer
572965c9a6 avformat/hdsenc: fix unintentional integer overflow in hds_write_packet() 
Fixes CID1135762

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 16:33:26 +01:00
Michael Niedermayer
95d2fc6a76 avformat/hdsenc: Check rename() return value 
Fixes CID1135748
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 16:30:07 +01:00
Michael Niedermayer
7441d1ec33 avformat/aviobuf: fix null dereference in avio_close_dyn_buf() 
Fixes CID1135769

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 16:16:04 +01:00
Michael Niedermayer
0fe6906d96 avfilter/aeval: Fix use of uninitialized variable 
Fixes CID1135776

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 15:31:32 +01:00
Michael Niedermayer
b6eee405ff avcodec/utils: Print warning if avcodec_set_dimensions() failed 
Fixes CID1135744
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 15:28:27 +01:00
Michael Niedermayer
0f65503799 avcodec/bitstream: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 14:34:45 +01:00
Carl Eugen Hoyos
945a440d11 Force one stream for raw muxers. 
Based on eeb975f5
Fixes ticket #3217.

Reviewed-by: Nicolas George
 2013-12-11 13:15:49 +01:00
Michael Niedermayer
7f39352a1b avformat/oggparseopus: calculate pts/dts for initial packets after seeking 
based on code from oggparsevorbis
Fixes Ticket3124
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 05:00:50 +01:00
Michael Niedermayer
39d11d599c avformat/oggparseopus: factor opus_duration() out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 04:17:19 +01:00
Michael Niedermayer
43f9255368 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  alsdec: check block length

See: 0ceca269b6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 01:24:35 +01:00
Michael Niedermayer
42874666a6 avcodec/snowdec: check av_frame_ref() return value 
Fixes CID1135742

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 01:13:24 +01:00
Michael Niedermayer
11679e1b90 avcodec/pthread_frame: Fix memleak of AVCodecContext on error 
Fixes CID1135767
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 00:27:09 +01:00
Michael Niedermayer
81ed7efbe2 avcodec/indeo3: check the return code of ff_set_dimensions() 
This is currently redundant as the checks before it are tighter than
the checks in ff_set_dimensions() but its more robust not to depend
on that.

Fixes CID1135740
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 00:05:34 +01:00
Michael Niedermayer
d9339ab553 avcodec/h264: fix code that blindly dereferences NULL DPB 
Fixes mixed flushing and decoding NULL packets
Found-by: wm4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-10 23:50:08 +01:00
Michael Niedermayer
e23b18321f avcodec/hnm4video: change width/height to int 
Fixes hypothetical integer overflows
Related to CID1135770 & CID1135771

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-10 23:50:08 +01:00
Michael Niedermayer
3af9d8269e avcodec/g2meet: check the return code of ff_set_dimensions() 
This is currently redundant as the checks before it are tighter than
the checks in ff_set_dimensions() but its more robust not to depend
on that.

Fixes CID1135739
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-10 18:34:52 +01:00
Michael Niedermayer
7fa9f7ef1c dvdsub_parse_extradata: fix memleak 
Fixes CID1135765
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-10 18:30:44 +01:00
Guillaume Martres
f90281ca97 hevc: Correctly set time_base 
- Try reading the time_base information from the VPS too, not just the VUI
- Only set time_base when an SPS is activated, not when it's decoded.
- Reduce the fraction before setting it.
- Don't set anything if the fraction is invalid (because the VUI is not
  present or because the encoded value is invalid).

Conflicts:
	libavcodec/hevc_ps.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-10 16:20:53 +01:00
Guillaume Martres
679a6377e4 hevc: avoid some unnecessary differences with libav 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-10 16:20:48 +01:00
Michael Niedermayer
6026a5ad4f sonic: Switch to rangecoder 
significantly improves compression rate

This also bumps version to 2 and drops support for version 0/1
If someone used version 0/1 despite their experimental status then support
for these can and should be added back

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-10 16:18:51 +01:00
Michael Niedermayer
c61daa68e4 avcodec/sonic: add larger version and minor_version fields with version >= 2 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-10 15:56:01 +01:00
Michael Niedermayer
4c32629b82 avcodec/sonic: move version to the context 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-10 15:50:12 +01:00
Michael Niedermayer
ec4d761c74 avcodec/sonic: fix memleaks 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-10 14:42:17 +01:00
Michael Niedermayer
8477e63d3c sonic: use M_SQRT2 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-10 14:38:38 +01:00
Reinhard Tartler
2a0fb7286d alsdec: check block length 
Fix writing over the end

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Addresses: CVE-2013-0845
 2013-12-10 07:21:40 -05:00
Michael Niedermayer
f8d8d2e235 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: Move log2 dependency declaration to a place it takes effect

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-10 11:52:51 +01:00
Diego Biurrun
1a5fdf9519 configure: Move log2 dependency declaration to a place it takes effect 
It was incorrectly moved in c869fcdeac.
 2013-12-10 10:25:12 +01:00
Michael Niedermayer
8e5a2989a3 avcodec/libvpx: set CODEC_CAP_EXPERIMENTAL correctly instead of testing at codec open time 
Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-10 04:02:10 +01:00
Michael Niedermayer
0e575c24d6 ffv1.4: use 2 coefficients for calculating the Y plane in the RCT 
0-0.7% improved compression

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-10 03:16:58 +01:00
Michael Niedermayer
2bdda9a15c avcodec/ffv1enc: fix use of uninitalized variable in choose_rct_params() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-10 02:53:04 +01:00
Michael Niedermayer
2836ef688b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: Split host and target libc detection

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-10 01:56:49 +01:00
Michael Niedermayer
1311ae8eee Merge commit 'c869fcdeac3b7cd71a852b928902daadeca55685' 
* commit 'c869fcdeac3b7cd71a852b928902daadeca55685':
  configure: Move toolchain dependency declarations to a more appropriate place

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-10 01:45:37 +01:00
Michael Niedermayer
985c5f226a avcodec/utils: check that extended data has been set correctly instead of forcing it in avcodec_decode_video2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-10 01:11:32 +01:00
Michael Niedermayer
7102083a26 avcodec/libutvideodec: free coded_frame with av_frame_free() instead if av_free* 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-10 01:11:32 +01:00
Michael Niedermayer
4c1b4ae1ba avcodec/libutvideodec: use av_frame_move_ref() 
AVFrames cannot be copied literally, their definition is in
avutil and their extended_data can point to their data[]

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-10 01:11:32 +01:00
Michael Niedermayer
999ee28124 avcodec/utils: dont depend on the channel layout in unrefcount_frame() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-10 01:11:32 +01:00