virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
66,442 Commits 37 Branches 400 Tags 460 MiB
a6fd685fed
Commit Graph

66442 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
a6fd685fed Merge commit 'd07ddc93e29a4fdf12cd426953a7ecd5abe5e36d' 
* commit 'd07ddc93e29a4fdf12cd426953a7ecd5abe5e36d':
  avcodec: Fix a doxy comment to refer to the right function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-25 12:09:32 +02:00
Martin Storsjö
d07ddc93e2 avcodec: Fix a doxy comment to refer to the right function 
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-09-25 10:01:25 +03:00
Michael Niedermayer
303fc9b368 avcodec/mpegvideo_enc: write a log message at verbose level if frame re-encoding occurs due to VBV 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-25 05:28:32 +02:00
James Almer
4f4f08e6f0 x86/idctdsp: port {put,add}_pixels_clamped to yasm 
Also add sse2 versions for both.
put_pixels_clamped port and sse2 version originally written by Timothy Gu.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-09-24 21:52:13 -03:00
James Almer
c99a882814 avcodec/idctdsp: change {put,add}_pixels_clamped to ptrdiff_t line_size 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-09-24 21:43:19 -03:00
Michael Niedermayer
6441d522e9 Merge commit '2f172f1ae984b763c06069adb51d0053b3834f4b' 
* commit '2f172f1ae984b763c06069adb51d0053b3834f4b':
  rtsp: Clear the session id on redirects

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-25 01:08:44 +02:00
Michael Niedermayer
d8ddac363e Merge commit 'ddf5fb71ee9c8b2d9a23c0f661a84896cd7050fc' 
* commit 'ddf5fb71ee9c8b2d9a23c0f661a84896cd7050fc':
  rtpenc: HEVC/H.265 support

Conflicts:
	Changelog
	libavformat/rtpenc.c
	libavformat/rtpenc_hevc.c
	libavformat/version.h

See: 6821a5a4ad
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-25 00:17:36 +02:00
Michael Niedermayer
b8d3f7fc21 Merge commit 'a2efbecc4ed12d287cf29856418c4da4a7648d95' 
* commit 'a2efbecc4ed12d287cf29856418c4da4a7648d95':
  libavformat: Move avc mp4 startcode parsing to a shared file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-25 00:09:42 +02:00
James Almer
ad26e83f9c avcodec/x86: use function pointers for {put,add}_pixels_clamped 
Same behavior as in simple_idct.
This way the best optimized versions available will be used instead.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-09-24 18:52:32 -03:00
Philip DeCamp
857fc0a71f libavutil/opt: fix av_opt_set_channel_layout() to access correct memory address 
Signed-off-by: Philip DeCamp <decamp@mit.edu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-24 22:57:40 +02:00
Martin Storsjö
2f172f1ae9 rtsp: Clear the session id on redirects 
This fixes handling redirects in case the server provided a session
id within the redirect reply.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-09-24 23:34:02 +03:00
Thomas Volkert
ddf5fb71ee rtpenc: HEVC/H.265 support 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-09-24 23:33:26 +03:00
Martin Storsjö
a2efbecc4e libavformat: Move avc mp4 startcode parsing to a shared file 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-09-24 23:33:17 +03:00
James Almer
70277d1d23 x86/videodsp: add ff_emu_edge_{hfix,hvar}_avx2 
~15% faster than sse2.

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-09-24 16:12:55 -03:00
Michael Niedermayer
280ef183db libavformat/ffmetadec: Make unchanged function arguments const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-24 19:17:55 +02:00
Michael Niedermayer
ab6f4fd4a7 libavformat/dv: Make unchanged function arguments const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-24 19:11:05 +02:00
Michael Niedermayer
af19d2ed1e libavformat/avienc: Make unchanged function arguments const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-24 18:34:21 +02:00
Michael Niedermayer
d6ed67780b libavformat/avidec: Make unchanged function arguments const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-24 18:33:55 +02:00
Michael Niedermayer
e27f781aeb Merge commit 'c463dfc7e49929a9891884312b23b27d14729c51' 
* commit 'c463dfc7e49929a9891884312b23b27d14729c51':
  rtpdec_hevc: Drop a duplicated, nonstandard entry

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-24 17:25:34 +02:00
Michael Niedermayer
3cd252d29a doc/APIchanges: fix typo 
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-24 17:14:56 +02:00
Michael Niedermayer
ac682955e9 postproc: add basic deblock filter visualization support 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-24 16:58:47 +02:00
Michael Niedermayer
266b3d4fe4 ffplay: use av_codec_get_pkt_timebase() 
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-24 13:44:56 +02:00
Vittorio Giovara
c463dfc7e4 rtpdec_hevc: Drop a duplicated, nonstandard entry 
The RFC spec draft only specifies the "H265" name - there is no
specification saying how to interpret "HEVC" (if such a packet
format is specified it could be an entirely different format).

Since this is a very new standard (still a draft), there is little
need for compatibility with existing, broken implementations. Therefore
remove the extra alias, to avoid the risk of encouraging incorrect
usage.

Intentionally keeping the ff_hevc_dynamic_handler name for the
handler, to use "hevc" consistently as name for the codec instead
of "h265" within the library internals as long as there only is one
single variant in actual use.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-09-24 10:44:14 +03:00
Michael Niedermayer
170e2fd7c3 configure: Check if "-D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600" is needed for localtime_r() 
Fixes build with musl

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-24 05:04:24 +02:00
Michael Niedermayer
3bc036171f configure: fail if SDL is unavailable and --enable-sdl is specified 
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-24 02:32:56 +02:00
Michael Niedermayer
fb01a18462 configure: reindent the --disable-sdl related code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-24 02:32:52 +02:00
Michael Niedermayer
a7ed01082f configure: support --disable-sdl 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-24 02:32:49 +02:00
Christophe Gisquet
3fe962940f hevc: move intermediate bidir buffer 
Other buffers are already there.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-24 01:26:12 +02:00
Christophe Gisquet
de60ce391d hevc: remove unneeded buffer. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-24 01:26:12 +02:00
James Almer
164d6c7f5b x86/videodsp: fix warning about discarded 'const' qualifier 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-09-23 19:59:20 -03:00
James Almer
789274dca8 avcodec/libvpxdec: don't check for formats other than i420 when vp9 decoding is disabled 
Should fix ticket #3958.

Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-09-23 19:50:28 -03:00
Michael Niedermayer
00d3bb1a07 tests/fate-run.sh: Cat .err file in case of error with V>0 
This may make fate failures where only the console output is available
easier to analyze

Suggested-by: Andreas Cadhalpun
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-24 00:35:38 +02:00
Carl Eugen Hoyos
9f0ba52f34 Skip decklink_common_c.h when running make checkheaders. 2014-09-23 22:51:36 +02:00
Michael Niedermayer
55179987e7 Merge remote-tracking branch 'cus/stable' 
* cus/stable:
  ffplay: move pts calculating code to generic decoder
  ffplay: factorize decoder functions to generic decoder
  ffplay: handle fullscreen status on resize event

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-23 22:09:54 +02:00
Bernd Kuhls
6b733be755 Fix compile error on arm4/arm5 platform 
Since these commits
http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=adf8227cf4e7b4fccb2ad88e1e09b6dc00dd00ed
http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8

compilation on arm4/arm5 fails:

libavcodec/libavcodec.so: undefined reference to
`ff_startcode_find_candidate_armv6'

Because libavcodec/arm/Makefile contains
ARMV6-OBJS-$(CONFIG_STARTCODE)         += arm/startcode_armv6.o
function ff_startcode_find_candidate_armv6 is not included for older ARM
archs. The bug was found during automatic buildroot builds:

http://autobuild.buildroot.net/results/ec7/ec71e4f16ee9106747dff5f15999cbd17903e76f//build-end.log
Quote from configure summary:
ARCH                      arm (armv4t)
big-endian                no
runtime cpu detection     yes
ARMv5TE enabled           no
ARMv6 enabled             no
ARMv6T2 enabled           no

http://autobuild.buildroot.net/results/be7/be72eb182eaccf0064a32c9dfc2ac1c0d6555506/build-end.log
ARCH                      arm (armv5te)
big-endian                no
runtime cpu detection     yes
ARMv5TE enabled           yes
ARMv6 enabled             no
ARMv6T2 enabled           no

This patch provides the necessary #if clauses as discussed with Michael:
https://ffmpeg.org/pipermail/ffmpeg-devel/2014-September/163329.html

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-23 21:11:05 +02:00
Marton Balint
1f5a3cf688 ffplay: move pts calculating code to generic decoder 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2014-09-23 21:08:40 +02:00
Marton Balint
9e0d1c00b5 ffplay: factorize decoder functions to generic decoder 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2014-09-23 21:08:40 +02:00
Marton Balint
32f1a288e2 ffplay: handle fullscreen status on resize event 
In some cases resize events can happen even during fullscreen, so let's pass
the proper flag to SDL_SetVideoMode.

Fixes ticket #3964.

Reported-by: Jeff Dwork <jeff@reggie.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2014-09-23 21:08:35 +02:00
Benoit Fouet
6843b9dc78 avformat/riffenc: Filter out "BottomUp" in ff_put_bmp_header() 
Fixes Ticket1304

Commit message and extradata size bugfix by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-23 18:24:40 +02:00
Pascal Massimino
e5b3112996 avcodec/webp: fix default palette color 0xff000000 -> 0x00000000 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-23 17:15:20 +02:00
Michael Niedermayer
b0f7de3e7c avcodec/asvenc: fix AAN scaling 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-23 17:04:02 +02:00
Michael Niedermayer
0bb5ad7a06 avcodec/asvenc: Fix integer overflow in level 
Warn if the qscale is too low for the input data and clip levels to
minimize artifacts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-23 15:46:52 +02:00
James Almer
6b2caa321f x86/vp9: add AVX and AVX2 MC 
Roughly 25% faster MC than ssse3 for blocksizes 32 and 64.

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-09-22 22:35:03 -03:00
Michael Niedermayer
2284413206 ffmpeg: replace impossible dts/pts combinations by a reasonable guess instead of hard failing 
Fixes stream copy from tserror270.ts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-23 01:38:12 +02:00
Nicholas Robbins
bdb7f08666 doc/decoders: adding documentation for lavc/dvdsubdec.c option "forced_subs_only" 
Signed-off-by: Nicholas Robbins <nickrobbins@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-22 23:35:49 +02:00
Nicholas Robbins
c7d21dee28 libavcodec/dvdsubdec: Add option forced_subs_only to only decode forced subtitle frames. 
Signed-off-by: Nicholas Robbins <nickrobbins@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-22 21:01:13 +02:00
Michael Niedermayer
1cf28fd5f3 avformat/asfenc: Make asf_write_indexs index argument const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-22 18:53:44 +02:00
Michael Niedermayer
d902a3f4cb avformat/adtsenc: buf isnt changed in adts_decode_extradata(), make it const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-22 18:47:14 +02:00
Michael Niedermayer
544380aaf0 avcodec/4xm: Make src of decode_p_block() const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-22 18:09:28 +02:00
Michael Niedermayer
3a7f9db180 avcodec/snow: Make block argumrnt of ff_snow_pred_block() const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-22 18:06:56 +02:00