eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-06-16 04:32:47 +02:00
Code Issues Packages Projects Releases Wiki Activity
47,963 Commits 39 Branches 423 Tags
00a62e6776c7b2393b1c6f3be9ae85200bf2bb1e
Commit Graph

11906 Commits

Author SHA1 Message Date
Carl Eugen Hoyos 00a62e6776 Do not skip three bytes and don't search for extradata in old realaudio files. 
Fixes ticket #1557.
 2012-12-18 23:04:19 +01:00
Michael Niedermayer 94ecbe23c5 Merge commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a' 
* commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a':
  au: Reorder code so that both muxer and demuxer are under #ifdefs
  fate: Move RALF test into lossless audio group
  cosmetics: Use consistent names for multiple inclusion guards.

Conflicts:
	libavformat/au.c
	tests/fate/lossless-audio.mak
	tests/fate/real.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-18 14:27:59 +01:00
Peter Ross 95015634f5 wtv: permit root table and first sectors to be located beyond 2GB boundary 
Fixes ticket #2025.

Signed-off-by: Peter Ross <pross@xvid.org>
 2012-12-19 00:18:17 +11:00
Michael Niedermayer ebfb738fa4 nutdec: sanity check r_frame_rate 
This fixes files that store a somewhat incorrect value.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-18 14:03:04 +01:00
Clément Bœsch 8b63744f48 Fix "bistream" typo and add a check in tools/patcheck. 2012-12-18 02:47:34 +01:00
Michael Niedermayer 1d29624c73 oggparsevorbis: check channels 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-17 20:51:50 +01:00
Jernej Virag 2f7465b5bf SAP muxer set session name from metadata 
Pass "title" metadata field to av_sdp_create (as in RTP muxer) in SAP
muxer for correct
session name in SAP SDP announcements.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-17 17:31:55 +01:00
Michael Niedermayer 8976ef7aec concatdec: change data type to suppress warning about limited range of data type on some platforms. 
Reviewed-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-17 17:31:34 +01:00
Derek Buitenhuis df0d6735b3 doxy: Clarify what avpriv_set_pts_info does 
The "pts for a given stream" was nonsensical.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-12-17 11:18:27 -05:00
Diego Biurrun c35f0e8495 au: Reorder code so that both muxer and demuxer are under #ifdefs 
This reduces code size when either piece has been disabled.
 2012-12-17 17:02:22 +01:00
Diego Biurrun 81c7c817a4 cosmetics: Use consistent names for multiple inclusion guards. 2012-12-17 17:02:22 +01:00
Michael Niedermayer 8d07bbca63 Merge commit 'f322b2073581119de5da74f92a03309a36891cfa' 
* commit 'f322b2073581119de5da74f92a03309a36891cfa':
  lavr: only save/restore the mixing matrix if mixing is being done
  rtpdec_vp8: Cosmetics: Fix bad alignment/indentation
  rtpenc: Allow including a SDES/CNAME block in RTCP SR packets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-17 14:06:11 +01:00
Michael Niedermayer 021b3497e1 Merge commit '65e053271a98f7acf3ef6b412998cfcb44a8eef8' 
* commit '65e053271a98f7acf3ef6b412998cfcb44a8eef8':
  rtpenc_vp8: Include the picture number in VP8 packets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-17 13:46:54 +01:00
Piotr Bandurski 0f450ac575 siff: set duration 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-17 13:34:30 +01:00
Peter Ross fb9d58509c isom: support SGI RLE 8-bit in QuickTime file format 
Signed-off-by: Peter Ross <pross@xvid.org>
 2012-12-17 20:37:54 +11:00
Peter Ross 6fb40779cd Silicon Graphics Movie (.mv) demuxer 
Signed-off-by: Peter Ross <pross@xvid.org>
 2012-12-17 20:37:54 +11:00
Michael Niedermayer 2e59142fa9 sctp: dont abort on invalid input 
Fixes Ticket1865

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-17 01:53:35 +01:00
Martin Storsjö e798085f96 rtpdec_vp8: Cosmetics: Fix bad alignment/indentation 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-16 21:33:20 +02:00
Martin Storsjö 3b2e8d1d21 rtpenc: Allow including a SDES/CNAME block in RTCP SR packets 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-16 21:32:58 +02:00
Martin Storsjö 65e053271a rtpenc_vp8: Include the picture number in VP8 packets 
This makes it easier for receivers to decide what to do if data
is lost.

Refactor calculating the max payload size, to avoid hardcoding the
header size in too many places, reducing the number of lines that
have to be touched if the header is adjusted further.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-16 21:32:13 +02:00
Piotr Bandurski cb8163d0bd bfi: set duration 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-16 16:53:01 +01:00
Michael Niedermayer de89dff8da brstm: ask for samples for version != 1.0 
This also avoids 2 unused variable warnings.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-16 15:05:31 +01:00
Paul B Mahol 5be38f9421 brstm: add missing new line to request for sample messages 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-16 13:04:17 +00:00
Paul B Mahol 1081d78746 build: fix idf demuxer dependency 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-16 12:00:23 +00:00
Piotr Bandurski 5648069270 aiff: support in24/in32 tags 
Supported by QuickTime, libaudiofile and Csound.
 2012-12-16 10:41:00 +00:00
James Almer 7959c26fb0 brstm: fix number of samples for the last block 
Signed-off-by: James Almer <jamrial@gmail.com>
 2012-12-16 10:34:33 +00:00
Piotr Bandurski d0bdcbcb28 thp: set duration 2012-12-16 10:27:54 +00:00
Michael Niedermayer 1e901ffc61 wrap_timestamp: remove unneeded check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-16 01:07:53 +01:00
Michael Niedermayer 1662bd350a lavf: fix integer overflows 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-16 01:05:36 +01:00
Harald Axmann 2d74dea84f lavf: Provide a monotonic timestamp to the outside world 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-15 21:28:45 +01:00
Stefano Sabatini ecebf6fc82 lavf/segment: provide more debug feedback when a new segment starts 2012-12-14 18:19:47 +01:00
Stefano Sabatini df5f9496e6 lavf/segment: add missing flags to segmenter option constants 2012-12-14 18:19:47 +01:00
Michael Niedermayer b2c2589ecf westwood_vqa: fix null pointer dereference 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-14 17:55:57 +01:00
Peter Ross 5c78a8129c sauce: test filetype correctly for datatype 5 (binary text) 2012-12-14 16:46:29 +11:00
Björn Axelsson 2947e7b7a7 flvenc: don't write random data if seek fails 
The FLV muxer tries to update the header in write_trailer, which is
impossible if writing to a pipe or network stream. Don't write header
data if seek to header fails.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-13 21:54:35 +01:00
Stefano Sabatini ddf6131a0a lavf/segment: add segment_start_number option 
Consistent with the image2 muxer.
 2012-12-13 21:38:43 +01:00
Stefano Sabatini d93d03a492 lavf/segment: add function set_segment_filename() 
Factorize.
 2012-12-13 21:05:07 +01:00
Michael Niedermayer 7726916c14 mpegts: check av_new_stream() return value. 
Fixes CID703728
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-13 17:46:17 +01:00
Nicolas George 2dbc84b1a8 lavf/matroskaenc: check for overflow in display width. 2012-12-13 12:45:07 +01:00
Michael Niedermayer 7897919a88 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  aacdec: Fix an off-by-one overwrite when switching to LTP profile from MAIN.
  x86inc: fix stack alignment on win64
  rtpproto: Remove unused defines

Conflicts:
	libavcodec/aacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-13 12:23:48 +01:00
Michael Niedermayer 2e5e2bf935 Merge commit 'f3f60dcbdd6ff2201526a603fe28293975bb7667' 
* commit 'f3f60dcbdd6ff2201526a603fe28293975bb7667':
  rtpdec_mpeg4: Cosmetic cleanup
  rtpdec: Cosmetic cleanup of the header
  rtpdec: Get rid of a useless _s suffix on a struct name

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-13 12:18:12 +01:00
Michael Niedermayer de7c95d551 Merge commit '7941159df6aad2d219e2a7184489be7a735dd944' 
* commit '7941159df6aad2d219e2a7184489be7a735dd944':
  rtpdec/enc: Remove outdated/useless/misleading comments
  rtpdec: Improve some comments
  rtpdec: Remove unused context variables
  rtpdec: Limit writing to the buffer size
  svq1: Fix building with -DDEBUG
  svq1: return meaningful error codes.

Conflicts:
	libavcodec/svq1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-13 12:06:19 +01:00
Nicolas George 26db6535fc lavf/matroskaenc: use integers to for display size. 
Avoid rounding differences between x86_32 and x86_64.
Fix trac ticket #1997.
 2012-12-12 20:59:34 +01:00
Michael Niedermayer 028cc42a16 read_gab2_sub: fix null pointer dereference 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-12 17:46:05 +01:00
Martin Storsjö 29d2595ad7 rtpproto: Remove unused defines 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-12 16:01:24 +02:00
Nicolas George 16c3cb9bbf lavf/concatdec: avoid leaking URLs. 
Use av_realloc instead of av_realloc_f to keep the original
array in case of failure: it is freed in full by the fail label.
 2012-12-12 12:15:57 +01:00
Michael Niedermayer 75b3911e5a mxf_set_audio_pts: fix division by 0 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-12 11:35:47 +01:00
Michael Niedermayer a0f659b275 oggspeexparse: fix array overread 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-12 11:21:23 +01:00
Martin Storsjö f3f60dcbdd rtpdec_mpeg4: Cosmetic cleanup 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-12 12:18:50 +02:00
Martin Storsjö 584a017925 rtpdec: Cosmetic cleanup of the header 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-12 12:18:44 +02:00