virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00
Code Issues Releases Activity
66,816 Commits 39 Branches 425 Tags
941aaa39e8cd78ba4d16dfcec767290aec9a0136
Commit Graph
66816 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer 941aaa39e8 postproc/postprocess: fix quant store for fq mode 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-12 22:22:39 +02:00
Michael Niedermayer 9a460db63b avfilter/vf_pp: add yuv 4:4:0 support 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-12 22:22:39 +02:00
Michael Niedermayer 1d3c87d6cd postprocess: add YUV 4:4:0 support 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-12 22:22:39 +02:00
James Almer 59d8050df1 avfilter: remove obsolete FF_API_DRAWTEXT_OLD_TIMELINE cruft 2014-10-12 15:54:58 -03:00
Michael Niedermayer acea53fea0 avcodec/eatgv: use av_freep(), do not leave stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-12 12:22:28 +02:00
Michael Niedermayer 28b829b8bb avcodec/eatqi: use av_freep(), do not leave stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-12 12:22:16 +02:00
Michael Niedermayer 20df02680c avcodec/error_resilience: avoid pointer arithmetic with NULL 
move the code after the existing NULL check
Fixes: signal_sigsegv_844d59_10_signal_sigsegv_a17bb7_366_mpegts_mpeg2video_mp2_dvbsub_topfield.rec

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-12 04:49:08 +02:00
Michael Niedermayer bec077a1ab Merge commit 'bd239c9a2e151c0aeeb653a571f130aae7320894' 
* commit 'bd239c9a2e151c0aeeb653a571f130aae7320894':
  lavf: Don't drop both pts and dts if timestamps are invalid

Conflicts:
	libavformat/utils.c
	tests/ref/fate/vc1-ism

See: cd6851c5ef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-12 00:56:26 +02:00
Michael NiedermayerandMartin Storsjö bd239c9a2e lavf: Don't drop both pts and dts if timestamps are invalid 
In these cases, only drop dts. Because if we drop both we have no
timestamps at all for some files.

This improves playback of HLS streams from GoPro cameras.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-10-12 01:32:52 +03:00
Michael Niedermayer 0db1f2c2c7 avcodec/mjpegdec: sanity check bits 
Fixes undefined shift
Fixes: asan_heap-oob_16668e9_2_asan_heap-oob_16668e9_346_miss_congeniality_pegasus_mjpg.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-12 00:28:07 +02:00
Karl KinigerandMichael Niedermayer 903156aa8a vf_drawtext: add missing clear of pointers after av_expr_free() 
Fixes segfault when using sendcmd with drawtext.

Since LIBAVFILTER_VERSION_MAJOR 5 FF_API_DRAWTEXT_OLD_TIMELINE
evaluates to 0.

Signed-off-by: Karl Kiniger <karl.kiniger@med.ge.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-11 23:16:31 +02:00
Michael Niedermayer e24e5986a6 avcodec/dct: use av_freep(), do not leave stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-11 22:51:33 +02:00
Michael Niedermayer 3521c70dab avcodec/dirac_parser: use av_freep(), do not leave stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-11 22:51:15 +02:00
Michael Niedermayer c712d240b1 avcodec/eamad: use av_freep(), do not leave stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-11 22:50:51 +02:00
Simon ThelenandMichael Niedermayer 8c4ca4aa5a ffmpeg_opt: abort if -to <= -ss 
Makes ffmpeg abort instead of continuing when stop_time <= start_time.

Closes ticket #4015.

Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-11 22:20:39 +02:00
Christophe GisquetandMichael Niedermayer 140f535517 proresenc_ks: use chroma sampling in autoselection 
If the chroma planes aren't subsampled, automatically select
the 4:4:4:4 profile.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-11 16:47:19 +02:00
RuoyuandMichael Niedermayer c44d8d9552 avutil/lzo: fix resource leak 
Signed-off-by: Ruoyu <liangry@ucweb.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-11 12:15:26 +02:00
Michael Niedermayer fba894615d swscale: support internal scaler cascades 
Fixes Ticket3170

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-11 05:05:17 +02:00
Michael Niedermayer b8a55994f0 avcodec/mpeg12dec: print aspect_ratio_info in debug output 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-11 03:22:16 +02:00
Michael Niedermayer ae17a0c258 Merge commit '1d4579e38ecad578c86516fad2837a273d11b320' 
* commit '1d4579e38ecad578c86516fad2837a273d11b320':
  tcp: Add AVOption support

Conflicts:
	libavformat/tcp.c

See: 2e009c6042
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-11 00:39:01 +02:00
Clément Bœsch 937aac4f97 avformat/assenc: make sure we crawl extradata only if it's non-null 2014-10-10 23:49:38 +02:00
Michael Niedermayer d246397161 Merge commit 'cd9d6399fd00f5aeacaa90cdc0b74c3570024119' 
* commit 'cd9d6399fd00f5aeacaa90cdc0b74c3570024119':
  tls: Support passing old-style tcp options

See: 4f4eb380f0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-10 22:28:49 +02:00
Michael Niedermayer 76d1ffffd0 Merge commit '3df8d52fcdc9036b4074fdc612d487ece8bb5b7f' 
* commit '3df8d52fcdc9036b4074fdc612d487ece8bb5b7f':
  rtsp: Add rtsps to the probe

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-10 21:36:27 +02:00
Michael Niedermayer 7028475f75 Merge commit 'c839b0439f0b01c72a6d253920d2e342b30f8bcb' 
* commit 'c839b0439f0b01c72a6d253920d2e342b30f8bcb':
  rtsp: Support tls when in listen mode

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-10 21:29:10 +02:00
Michael Niedermayer c9791925a1 Merge commit '8b2e9636c57b22582143467a8a06b509b47b92f9' 
* commit '8b2e9636c57b22582143467a8a06b509b47b92f9':
  rtsp: Support tls-encapsulated RTSP

Conflicts:
	libavformat/rtsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-10 21:18:41 +02:00
Michael Niedermayer 544f811453 Merge commit 'c27328e749ff3be648411765cd17362fee017341' 
* commit 'c27328e749ff3be648411765cd17362fee017341':
  rtsp: Check for command strings without spaces

Conflicts:
	libavformat/rtspdec.c

See: a0568ed254
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-10 21:05:49 +02:00
Michael Niedermayer cec7afd036 Merge commit '09e1ccc8cddc946da5e10841f10dc5ebdd187d9d' 
* commit '09e1ccc8cddc946da5e10841f10dc5ebdd187d9d':
  sctp: Use AVERROR_BUG instead of abort()

Conflicts:
	libavformat/sctp.c

See: 2e59142fa9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-10 20:51:52 +02:00
Michael Niedermayer fc6aa30459 Merge commit 'eb4f9069002e73648f6640cd054fc814cfda75b8' 
* commit 'eb4f9069002e73648f6640cd054fc814cfda75b8':
  lavf: More informative error message

Conflicts:
	libavformat/mux.c

See: 30ced7e69f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-10 20:38:51 +02:00
Christophe GisquetandMichael Niedermayer cb530dda7d utvideoenc: properly set slice height/last line 
Mimic decoder and obey sampling.

Does not affect fate tests for utvideo.
Fixes ticket #3949.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-10 20:08:24 +02:00
Michael Niedermayer 171d971dbf avutil/softfloat: Fix undefined shift in av_add_sf() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-10 19:36:12 +02:00
Benoit FouetandMichael Niedermayer 5e6fd132ff avformat/movenc: add EAC3 muxing support. 
Support only one independent substream right now, and only syncframes
containing 6 blocks.

Fixes part of ticket #3074

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-10 19:07:08 +02:00
James Almer 5402d1bce5 float_dsp-test: allow forcing cpuflags 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-10-10 13:51:51 -03:00
Michael Niedermayer ea77d3b889 avcodec/atrac3: use av_freep(), do not leave stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-10 17:10:02 +02:00
Michael Niedermayer 3537ddb76f avcodec/cavs: use av_freep(), do not leave stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-10 17:09:46 +02:00
Luca Barbato 1d4579e38e tcp: Add AVOption support 2014-10-10 16:29:07 +02:00
Luca Barbato cd9d6399fd tls: Support passing old-style tcp options 
Make tcp and tls urls near-interchangeable.
 2014-10-10 16:29:07 +02:00
Luca Barbato 3df8d52fcd rtsp: Add rtsps to the probe 2014-10-10 16:29:06 +02:00
Luca Barbato c839b0439f rtsp: Support tls when in listen mode 2014-10-10 16:29:06 +02:00
Luca Barbato 8b2e9636c5 rtsp: Support tls-encapsulated RTSP 2014-10-10 16:29:06 +02:00
Luca Barbato c27328e749 rtsp: Check for command strings without spaces 
Prevent a NULL-pointer dereference.

CC: libav-stable@libav.org
 2014-10-10 16:29:06 +02:00
Luca Barbato 09e1ccc8cd sctp: Use AVERROR_BUG instead of abort() 
Trying to write to a stream id larger the the maximum requested is
a programming error, still there is no reason to leave a
reachable abort() in the codebase.

CC: libav-stable@libav.org
 2014-10-10 16:29:06 +02:00
Luca Barbato eb4f906900 lavf: More informative error message 
Print the timestamp values and not just the stream index.
 2014-10-10 16:29:06 +02:00
Rong YanandMichael Niedermayer 0d71bd5a94 libavcodec/ppc/hpeldsp_altivec.c : fix ff_put_pixels16_altivec() for POWER LE 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-10 14:24:22 +02:00
Rong YanandMichael Niedermayer c1fa5d1bd4 libavcodec/ppc/me_cmp.c : fix sad16_altivec() sse16_altivec() sad16_xy2_altivec() sad16_x2_altivec() sad16_y2_altivec() sad8_altivec() for POWER LE 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-10 14:24:22 +02:00
Di WuandReynaldo H. Verdejo Pinochet 162b521108 vp9: enable multi-thread decoding when refreshctx is equal to 0 
In vp9_decode_frame function, ff_thread_finish_setup is not called
when refreshctx is equal to 0, and the next decoding thread can not
start work until the cunrrent frame has been decoded completely. So
ff_thread_finish_setup needs to be called to enable Multi-thread
decoding in this condition.

Signed-off-by: Di Wu <di1028.wu@samsung.com>
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-10-10 09:13:44 -03:00
Rong YanandMichael Niedermayer c5ca76ad3b libavcodec/ppc/mpegvideoencdsp.c : fix pix_norm1_altivec() and pix_sum_altivec() for POWER LE 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-10 13:32:02 +02:00
Rong YanandMichael Niedermayer 31dea05170 libavcodec/ppc/pixblockdsp.c : fix get_pixels_altivec() and diff_pixels_altivec() for POWER LE 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-10 13:31:49 +02:00
Michael Niedermayer 54df78af65 Merge commit 'b7c3bfd5eb3153f7de8039f96e7911b2a1d46cae' 
* commit 'b7c3bfd5eb3153f7de8039f96e7911b2a1d46cae':
  w32pthreads: use the condition variable API directly when targeting newer versions of Windows

Conflicts:
	compat/w32pthreads.h

See: 8c6992bf0c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-10 12:25:50 +02:00
Michael Niedermayer 09c538b6e6 Merge commit '73ea3ffcd55b0b1d23ba4769d65996a8d58ffa11' 
* commit '73ea3ffcd55b0b1d23ba4769d65996a8d58ffa11':
  w32pthreads: use the CONDITION_VARIABLE typedef if available

Conflicts:
	compat/w32pthreads.h
	configure

See: 0c06949314
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-10 12:13:09 +02:00
James AlmerandMartin Storsjö b7c3bfd5eb w32pthreads: use the condition variable API directly when targeting newer versions of Windows 
Wrap the function calls in a similar fashion to how it's being done
with the critical section API.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-10-10 11:27:30 +03:00