ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-21 13:56:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,344 Commits 36 Branches 398 Tags 535 MiB
b7faa9d314
Commit Graph

74344 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
b7faa9d314 swscale/alphablend: support packed pixel formats 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-09 15:58:43 +02:00
Michael Niedermayer
16df02fd2e avcodec/snowenc: Avoid use of deprecated me_method 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-09 14:33:31 +02:00
Michael Niedermayer
c64f01227f swscale/swscale: Document param[0..1] 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-09 14:33:19 +02:00
Andreas Cadhalpun
e66a43f694 graphdump: include internal.h for AVFilterPad 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-08-08 21:59:21 +02:00
Andreas Cadhalpun
9126ae4b6b use avfilter_pad_get_{type,name} accessor functions 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-08-08 21:59:02 +02:00
Andreas Cadhalpun
8bd74aafe8 avfilter: remove obsolete function declarations 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-08-08 21:58:48 +02:00
Andreas Cadhalpun
2e9c8be834 avcodec: add missing FF_API_CODEC_ID guard 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-08-08 21:58:31 +02:00
Michael Niedermayer
5edab1d207 cmdutils: remove sws_opts usage, simplify code 
It has become unused as all code was switched to AVDictionary

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-08 16:51:25 +02:00
Michael Niedermayer
408c9cf0e2 cmdutils: Fix overriding flags on the command line. 
Previously the code just appended the strings of flags which
worked with "+bitexact" but would not work with something like "0"

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-08 14:58:38 +02:00
Michael Niedermayer
6dbaeed6b7 ffmpeg: switch swscale option handling to AVDictionary similar to what the other subsystems use 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-08 14:44:15 +02:00
Michael Niedermayer
d3d776ccf9 avfilter/vf_scale: apply generic options after flags. 
Otherwise the flags overwrite anything set by the generic stuff to the flags

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-08 14:44:15 +02:00
Michael Niedermayer
e755954a84 ffplay: pass all sws options to the filter graph 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-08 13:25:12 +02:00
Michael Niedermayer
165fb7eba8 cmdutils: Export all sws options using a AVDictionary like the other subsystems do 
This makes extracting options other than sws_flags easier

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-08 13:24:52 +02:00
Michael Niedermayer
41e733c1ef avfilter/graphparser: Do not ignore scale_sws_opts if args == NULL 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-08 13:24:52 +02:00
Michael Niedermayer
d0e0757e9a swscale: Implement alphablendaway for planar 4:4:4 formats 
Fixes Ticket4746

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-08 13:24:52 +02:00
Michael Niedermayer
c382d9e8cb swscale: Add sws_alloc_set_opts() 
This simplifies allocating and initializing swscale contexts with custom options.
The function is internal currently but could be moved into the public header

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-08 13:08:16 +02:00
Carl Eugen Hoyos
7e9cd99627 lavc: The h263 encoder (also) depends on h263data.o 2015-08-08 12:11:33 +02:00
Carl Eugen Hoyos
176698260c configure: mpegvideo depends on mpeg_er. 
Fixes compilation with --disable-everything --enable-encoder=mjpeg
While there, clean up some recursive dependencies.
Reported-by: Bernhard Döbler, programmer bardware de
 2015-08-08 11:02:25 +02:00
Ludmila Glinskih
8ec89681af tests/api/api-h264-test: structure changes to avoid duplicate code 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-08 09:53:00 +02:00
Niklesh
ecc806a224 movtextdec: Fix memory leaks by freeing mem allocs correctly 
Initialize m->count_f to 0 at the correct place to free memory allocs properly.

Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
 2015-08-07 16:33:31 -07:00
Michael Niedermayer
7d3aa2ca63 avutil/float_dsp: Remove use of deprecated av_set_cpu_flags_mask() 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-07 22:46:27 +02:00
Michael Niedermayer
005d006938 avcodec/libopenh264enc: Avoid usage of deprecated ff_alloc_packet() 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-07 22:46:27 +02:00
Paul B Mahol
2bdd026b26 avfilter/avf_avectorscope: stop making output fully transparent 2015-08-07 16:44:19 +02:00
Hendrik Leppkes
8015150f43 Merge commit '9469370fb32679352e66826daf77bdd2e6f067b5' 
* commit '9469370fb32679352e66826daf77bdd2e6f067b5':
  h264: Use AVERROR return codes instead of -1

Only partially merged, as the first hunk is not correct and would result
in endless log spam.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-07 09:54:12 +02:00
Hendrik Leppkes
3d2d672828 Merge commit 'e5997152f54f790229c99f237f8eb6b5b1ee683a' 
* commit 'e5997152f54f790229c99f237f8eb6b5b1ee683a':
  asf: Use time_t where needed

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-07 09:27:55 +02:00
Hendrik Leppkes
b54cf4b886 Merge commit '944f60866f507e3c0850ae9c2f30dac1da54587c' 
* commit '944f60866f507e3c0850ae9c2f30dac1da54587c':
  asfdec: read values properly

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-07 09:27:49 +02:00
Rostislav Pehlivanov
c47c781e83 aacenc: Move local encoder specific tables to a separate file 
This commit moves any tables specific to the encoder from aacenc
and aaccoder to a separate file called 'aacenctab.c/.h'.
This was done as a clean up attempt as the encoder was filled with
tables pasted in between functions which made it confusing to follow
and track where each table and definition had been used.
This commit solves this by simply exporting the smaller tables out to
the aacenctab.h while the larger ones are compiled using aacenctab.c
and are referenced from the header file.

Signed-off-by: Claudio Freire <klaussfreire@gmail.com>
 2015-08-07 03:58:07 -03:00
James Almer
9c0407e856 x86/sbrdsp: remove an unnecessary mova in sbr_autocorrelate 
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-08-06 23:42:19 -03:00
Michael Niedermayer
bee2e702cc tests/fate/mp3: increase mp3-float-extra_overread FUZZ for ppc64be-RHEL7.0-gcc-4.8.2-ibmcrl to 23 from 20 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-07 02:54:59 +02:00
Michael Niedermayer
ae413a48e6 avcodec/movtextdec: check that ftab has been allocated before dereferencing it 
Fixes potential null pointer dereference on deallocation

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-06 23:38:55 +02:00
Niklesh
2e7a684e72 movtextdec.c: Add support for font names 
Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
 2015-08-06 08:42:09 -07:00
wm4
8024002d40 vc1dec: propagate error codes and return meaningful error codes 2015-08-06 15:27:19 +02:00
Paul B Mahol
40ddbc87c5 avfilter/avf_showspectrum: use av_calloc() 2015-08-06 15:06:14 +02:00
Michael Niedermayer
cb5190bc9d avcodec/diracdec: Move reference to DiracFrame, avoid use of the deprecated field from AVFrame 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-06 12:44:37 +02:00
Michael Niedermayer
a368920eef avcodec/options: Silence deprecated warning about coded_frame 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-06 12:39:37 +02:00
wm4
94c0df79c7 lavc: propagate hwaccel errors 
At least the new videotoolbox decoder does not actually set a frame if
end_frame fails. This causes the API to return success and signals that
a picture was decoded, even though AVFrame->data[0] is NULL.

Fix this by propagating end_frame errors.
 2015-08-06 11:05:02 +02:00
Michael Niedermayer
ace8376653 avformat/matroskaenc: Avoid "for (int i" syntax for better compatibility 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-06 01:15:08 +02:00
Henrik Gramner
5e8e121fcc checkasm: Remove unnecessary include 2015-08-05 23:21:28 +02:00
周晓勇
71575d98f5 avcodec: loongson optimized h264pred with mmi v2 
Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-05 22:52:52 +02:00
Sasi Inguva
31852540d4 libavformat/matroska: Write stream durations in metadata, in the format of mkvmerge. 
Compute individual stream durations in matroska muxer.
Write them as string tags in the same format as mkvmerge tool does.

Signed-off-by: Sasi Inguva <isasi@google.com>
 2015-08-05 22:29:23 +02:00
Marton Balint
b1f78632c6 ffplay: do not block audio thread on WIN32 
The windows SDL audio driver plays the old data in the buffer in a loop if it
is not updated in time. So instead of waiting for data and blocking the the
audio thread, return silence if no data is available.

Should fix ticket #2289.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2015-08-05 21:09:30 +02:00
Anton Mitrofanov
8db0f71b49 x86inc: warn if XOP integer FMA instruction emulation is impossible 
Signed-off-by: Henrik Gramner <henrik@gramner.com>
 2015-08-05 16:15:40 +02:00
Michael Niedermayer
e740659a5d avcodec/avcodec: Define CODEC_CAP_* based on AV_CODEC_CAP_* 
Avoid duplicating the literal numeric values

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-05 15:45:50 +02:00
Michael Niedermayer
4ab1f33daf avcodec/avcodec: Replace AV_CODEC_FLAG* values by 1 << C style for consistency 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-05 15:45:50 +02:00
Michael Niedermayer
500bfbe27a avcodec/hapenc: Remove use of deprecated ff_alloc_packet() 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-05 15:45:50 +02:00
Ronald S. Bultje
22b30f925d vf_psnr: add psnr_avg to stats file. 2015-08-05 09:19:09 -04:00
Hendrik Leppkes
45d9d16863 Merge commit 'b197f78329615893201c0e241d00b71b7c749dbb' 
* commit 'b197f78329615893201c0e241d00b71b7c749dbb':
  configure: Silence error messages when probing compiler

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-05 12:19:07 +02:00
Hendrik Leppkes
7e2717ba3c Merge commit '98c9ade9853a9c413534ef243174d65f3f7506fa' 
* commit '98c9ade9853a9c413534ef243174d65f3f7506fa':
  drawtext: Move the strftime expansion in a separate function

Not merged, the code does not exist anymore.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-05 12:18:31 +02:00
Hendrik Leppkes
4eded225ad Merge commit 'fe026ba960790a004adfcff33f44f96b05538e5c' 
* commit 'fe026ba960790a004adfcff33f44f96b05538e5c':
  drawtext: Drop stray guards

Conflicts:
	libavfilter/vf_drawtext.c

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-05 12:15:41 +02:00
Hendrik Leppkes
00b5c19661 Merge commit '4fee11ab05fc8569ef35c0ce86a60375c903eefb' 
* commit '4fee11ab05fc8569ef35c0ce86a60375c903eefb':
  png: Be more informative regarding signature errors

Conflicts:
	libavcodec/pngdec.c

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-05 12:10:08 +02:00