virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity
32,420 Commits 37 Branches 400 Tags 458 MiB
8096b7c67f
Commit Graph

32420 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chiranjeevi Melam
8096b7c67f asfenc: fix assert failure on long ffserver runs 2011-09-09 03:34:27 +02:00
Gavin Kinsey
d64066f6e8 Prevent double free of side_data when AVFMT_FLAG_KEEP_SIDE_DATA flag is set 2011-09-08 23:47:23 +02:00
Clément Bœsch
5241bc2773 ffprobe: replace simple string printing with the appropriate helper. 2011-09-08 23:15:55 +02:00
Michael Niedermayer
78d7d8fe91 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Employ FF_ARRAY_ELEMS instead of manually calculating array length.
  Fixed invalid access in wavpack decoder on corrupted bitstream.
  Fixed invalid writes in wavpack decoder on corrupted bitstreams.
  Fixed invalid access in wavpack decoder on corrupted extra bits sub-blocks.
  rtpdec_asf: Fix integer underflow that could allow remote code execution

Conflicts:
	libavformat/rtpdec_asf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-08 22:37:31 +02:00
Chris Rankin
04c13dca88 qcelpdec: fix the return value of qcelp_decode_frame(). 2011-09-08 21:20:50 +02:00
Chris Rankin
54e1eaef67 mp3dec: Dont spam the user on multiple mp3 frames. 2011-09-08 21:04:26 +02:00
Yan Jing
8ba987bff3 ffmdec: set avio buffer to ffm->packet_size, avoid dirty reads 2011-09-08 20:53:44 +02:00
Michael Niedermayer
0b99e858d1 ffmdec: fix seeking for non indexed files 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-08 20:53:37 +02:00
Yan Jing
59810f8388 ffmdec: handle wrapped file in ffm_seek 2011-09-08 20:09:40 +02:00
Michael Niedermayer
6337de9252 doxygen: dont generate docs for avconv.c 
This is a workaround to avoid links in the ffmpeg.c documentation randomly pointing to
different code in avconv.c
This should be removed once doxygen is fixed and we upgraded
doxygen 1.7.3 is the latests i tested and that still has this issue.
Fixed Ticket421

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-08 17:56:17 +02:00
Diego Biurrun
6376362d15 Employ FF_ARRAY_ELEMS instead of manually calculating array length. 2011-09-08 15:57:14 +02:00
Laurent Aimar
55354b7de2 Fixed invalid access in wavpack decoder on corrupted bitstream. 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-09-08 12:04:06 +03:00
Laurent Aimar
0aedab0340 Fixed invalid writes in wavpack decoder on corrupted bitstreams. 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-09-08 12:00:13 +03:00
Laurent Aimar
beefafda63 Fixed invalid access in wavpack decoder on corrupted extra bits sub-blocks. 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-09-08 11:57:13 +03:00
Carl Eugen Hoyos
f6e99bf514 Add loas as an extension for LOAS/LATM. 2011-09-08 08:24:17 +02:00
Carl Eugen Hoyos
c1fcd7e1ab Support remuxing aac_latm. 2011-09-08 08:22:50 +02:00
James Zern
1da43f7e99 libvpxenc: add 'crf' private option 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-08 05:53:54 +02:00
James Zern
3dc14b4628 libvpxenc: add 'rc_lookahead' private option 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-08 05:53:54 +02:00
James Zern
fb99d78778 libvpxenc: silence AVOption related warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-08 05:53:54 +02:00
Michael Niedermayer
0962ad0e2f avopt: Fix searching for constants 
Fixes Ticket350

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-08 05:34:17 +02:00
Michael Niedermayer
bd358e128f jpeglsdec: fix infinite loop 
Fixes Ticket331

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-08 05:34:17 +02:00
zhentan feng
42d4df06e1 WTV muxer (1_extract_wtv_common_code.patch) 2011-09-08 01:55:07 +02:00
Asad Mehmood
bcc531f04a flvdec: Remove AVFMTCTX_NOHEADER if both flags and metadata claim 1 stream 
If there is only 1 stream in an flv avformat_find_stream_info will continually
read until probesize is reached. This should stop it reading if the metadata
also claims there to be 1 stream.
 2011-09-08 00:26:28 +02:00
Michael Niedermayer
f1b5693027 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Add LATM muxer
  v210enc: clip values according to specifications
  v210enc: switch to PIX_FMT_422P10
  v210dec: switch to PIX_FMT_422P10
  AVOptions: remove AVOption.offset <= 0 checks
  AVOptions: deprecate av_opt_set_defaults2
  AVOptions: move doxy for av_opt_set_defaults() from opt.c to opt.h
  libx264: fix setting some more parameters
  libx264: fix setting the H.264 level
  libx264: add 'direct-pred' private option
  libx264: add 'partitions' private option

Conflicts:
	Changelog
	libavcodec/Makefile
	libavcodec/libx264.c
	libavcodec/v210enc.c
	libavfilter/src_movie.c
	libavformat/version.h
	libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-07 22:58:39 +02:00
Michael Niedermayer
5ea091fb5a rtpdec_asf: Fix integer underflow that could allow remote code execution 
Fixes MSVR-11-0088.
Credit:  Jeong Wook Oh of Microsoft and Microsoft Vulnerability Research (MSVR)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-09-07 23:33:53 +03:00
Michael Niedermayer
a2b66a366d rtpdec_asf: fix memleak 
Based on a suggestion by Ronald S. Bultje
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-07 16:48:49 +02:00
Michael Niedermayer
ba9a7e0d71 rtp: Fix integer underflow that could allow remote code execution. 
Fixes MSVR-11-0088
Credit:  Jeong Wook Oh of Microsoft and Microsoft Vulnerability Research (MSVR)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-07 14:59:39 +02:00
Kieran Kunhya
0ca36b4de7 Add LATM muxer 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-09-07 12:57:55 +02:00
Baptiste Coudurier
635bbecfc3 v210enc: clip values according to specifications 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-07 12:50:11 +02:00
Baptiste Coudurier
d239b83e2e v210enc: switch to PIX_FMT_422P10 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-07 12:16:21 +02:00
Baptiste Coudurier
08fa23d6c2 v210dec: switch to PIX_FMT_422P10 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-07 12:16:15 +02:00
Anton Khirnov
4dbcdfa86d AVOptions: remove AVOption.offset <= 0 checks 
They will only ever be <=0 if the option is broken, in which case this
check is hiding a bug.
 2011-09-07 11:20:29 +02:00
Anton Khirnov
79eff91325 AVOptions: deprecate av_opt_set_defaults2 
It's a hack which was created to allow for multiple options with
different defaults to refer to same field (e.g. 'b' vs 'ab'). There is
no need for it anymore.
 2011-09-07 11:19:43 +02:00
Anton Khirnov
a7e2b2ccc9 AVOptions: move doxy for av_opt_set_defaults() from opt.c to opt.h 
Also change it to be more readable.
 2011-09-07 11:16:52 +02:00
Anton Khirnov
0962f23b35 libx264: fix setting some more parameters 
Specifically, trellis, nr, me_range, me_method, subq, b_strategy,
keyint_min, chroma_me and coder.
Change their defaults to -1 and apply them after
x264_param_default_preset() if the user explicitly set them.
 2011-09-07 10:36:15 +02:00
Andrej Peterka
2bb5d637fc libx264: fix setting the H.264 level 
Move setting it after x264_param_default_preset()

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-07 09:16:06 +02:00
Anton Khirnov
9c684feadc libx264: add 'direct-pred' private option 
Deprecate AVCodecContext.directpred
 2011-09-07 07:27:55 +02:00
Anton Khirnov
0635a8aa21 libx264: add 'partitions' private option 
Deprecate AVCodecContext.partitions.
 2011-09-07 07:27:18 +02:00
Mark Himsley
3961695b7f Correct docs for boxblur parameters 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-07 04:18:43 +02:00
Joseph Wecker
0078430e30 flvdec: A little bit of cleanup 2011-09-07 02:38:57 +02:00
Joseph Wecker
4ee53d7e86 flvenc: Correctly encode data stream into in-band metadata frames. 2011-09-07 02:38:15 +02:00
Joseph Wecker
4c05042978 flvdec: Properly decoding in-band metadata packets as data frames. 2011-09-07 02:38:13 +02:00
Joseph Wecker
c054f11606 flvdec: Started to remove most of the "only 1-audio+1-video" assumptions 2011-09-07 02:36:42 +02:00
Joseph Wecker
30bcd6a945 flv: Ammon's changes migrated from 0.6.0 - I believe for the android broadcaster. 2011-09-07 02:02:03 +02:00
Carl Eugen Hoyos
b5d4c0e26e Support Speex in isom. 
Adobe Flash Media Server produces such files although the f4v
specification does not allow Speex (nor Nellymoser).
 2011-09-07 01:10:14 +02:00
Carl Eugen Hoyos
d898ab9090 Fix decoding of 2/4 bpp Tiff samples. 2011-09-07 01:10:14 +02:00
Carl Eugen Hoyos
f863cdef81 Cosmetics: Fix comment. 2011-09-07 01:10:14 +02:00
Michael Niedermayer
9243454e31 libavformat/utils: only run delta_dts_min calculation code when its value is used. 
This should improve speed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-07 00:23:18 +02:00
Michael Niedermayer
effbeff503 libavformat/utils: use FFMIN() where possible 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-07 00:13:09 +02:00
wg
37ed5df5c5 libavformat/utils: Treat subtitle streams as noninterleaved when 20 seconds have passed without a packet 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-07 00:10:44 +02:00