generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
32,551 Commits 24 Branches 241 Tags 173 MiB
3fdf519e4b
Commit Graph

32551 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Niedermayer
c0323b9c9b avfilter: dont crash on filters with NULL instance names. 
Found-by: Rolf Siegrist
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-06 22:23:15 +02:00
Michael Niedermayer
2fd4901921 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  libx264: add 'cplxblur' private option
  libx264: add 'deblock' private option
  libx264: add 'b-bias' private option
  libx264: fix setting some options.
  libx264: remove useless assignment
  ac3dec: avoid pointless alloc and indirection for input_buffer
  mpeg12: cosmetics: reformat as K&R

Conflicts:
	libavcodec/libx264.c
	libavcodec/mpeg12.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-06 21:35:18 +02:00
Ramiro Polla
ff5e1b0b7a dshow: properly disconnect and remove filters from graph 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-06 21:14:51 +02:00
Ramiro Polla
5e77dc2ea7 dshow: remove some unused code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-06 21:13:06 +02:00
Ramiro Polla
0a333001a2 vfwcap: actually use framerate option 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-06 21:12:45 +02:00
Anton Khirnov
7042337673 libx264: add 'cplxblur' private option 
Deprecate AVCodecContext.complexityblur
 2011-09-06 21:03:41 +02:00
Anton Khirnov
71b5f4427b libx264: add 'deblock' private option 
Deprecate AVCodecContext.deblockalpha/deblockbeta
 2011-09-06 21:02:45 +02:00
Anton Khirnov
f83c45183e libx264: add 'b-bias' private option 
Deprecate AVCodecContext.bframebias.
 2011-09-06 20:14:35 +02:00
Anton Khirnov
bb73cda2f6 libx264: fix setting some options. 
Specifically: gop_size, max_b_frames, scenechange_threshold, qmin, qmax,
max_qdiff, qblur, qcompress and refs.

Change their default values to -1 and only use them if the user
explicitly set them. Otherwise x264 defaults are used.

Move setting those options after x264_param_default_preset(), so they
don't get overwritten by it.
 2011-09-06 20:13:28 +02:00
Anton Khirnov
d8dee0e7bd libx264: remove useless assignment 
priv_data is memset to 0.
 2011-09-06 20:13:11 +02:00
Michael Niedermayer
0c9cba24b7 pngdec: implement 4bpp interlaced 
Fixes Ticket435

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-06 19:50:01 +02:00
Michael Niedermayer
dcabb3d608 pngdec: implement 2 bpp interlaced. 
Fixes Ticket434

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-06 19:50:01 +02:00
Stefano Sabatini
4f7dfe12ea lavfi: rename vsink_buffer.c to sink_buffer.c, and vsink_buffer.h to buffersink.h 
This is done in order to clarify the non-video-specific nature of the
buffersink code, as the result of the video/audio API unification of
the previous commit, and for improving overall consistency.
 2011-09-06 18:51:09 +02:00
Stefano Sabatini
c4415f6ec9 lavfi: unify asink_buffer and vsink_buffer API 
The new API is more generic (no distinction between audio/video for
pulling frames), and avoids code duplication.

A backward compatibility layer is kept for avoiding tools ABI breaks
(only for the video binary interface, audio interface was never used
in the tools).
 2011-09-06 18:47:04 +02:00
Reimar Döffinger
459fe331e9 ac3dec: avoid pointless alloc and indirection for input_buffer 
Since we now always allocate it, it can simply be made part of the context
instead.
 2011-09-06 12:43:16 -04:00
Michael Niedermayer
be7eed72c8 mjpegdec; even better RSTn skiping 
Fixes Ticket426

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-06 18:20:34 +02:00
Michael Niedermayer
bc6445f2db pngdec: Fix interlaced PAETH prediction 
Fixes Ticket161

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-06 16:22:38 +02:00
Michael Niedermayer
2d4102fc13 pngdec: Implement 2bpp 
Fixes Ticket433

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-06 15:48:01 +02:00
Michael Niedermayer
dc43ad6d1a pngdec: Fix interlaced 1bpp 
Fixes Ticket214

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-06 15:28:36 +02:00