generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
58,114 Commits 24 Branches 241 Tags 173 MiB
d03eea36b2
Commit Graph

58114 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
175e689cc5 avfilter/graphparser: zero filter_ctx in case of deallocation in create_filter() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-07 23:38:44 +01:00
Michael Niedermayer
ec8e68c763 Merge commit 'cffecc0e7ebd642afaa1fb9f56fab1fcc283293c' 
* commit 'cffecc0e7ebd642afaa1fb9f56fab1fcc283293c':
  avfilter/graphparser: Directly free filter memory if initialization fails

Conflicts:
	libavfilter/graphparser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-07 23:05:26 +01:00
Lenny Wang
7c02a77d25 avfilter/unsharp: added optimized opencl kernels 
Reviewed-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-07 22:31:43 +01:00
Dave Yeo
f9c6044a6f Fix compilation with os2threads 
Signed-off-by: Dave Yeo <daveryeo@telus.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-07 20:46:44 +01:00
Michael Niedermayer
3836af4765 avformat/mpegvideodec: check seq headers more completely during probing 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-07 20:39:08 +01:00
Clément Bœsch
3bcd5c1e31 avformat/img2enc: simplify split planes extension selection. 2013-11-07 20:30:43 +01:00
Clément Bœsch
3e036d407d doc/muxers: document animated GIF muxer. 2013-11-07 20:30:43 +01:00
Clément Bœsch
c37b0daf33 avformat/gif: fix final_delay unit in documentation. 2013-11-07 20:30:43 +01:00
Clément Bœsch
3c5e6e7635 avformat/img2enc: reindent after previous commit. 2013-11-07 20:30:43 +01:00
Clément Bœsch
f70db22999 avformat/image2: allow muxing gif files. 
Fixes Ticket #2936.
 2013-11-07 20:30:43 +01:00
Paul B Mahol
d9d752cfb5 avfilter/af_aecho: free input frame after it is being used 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-07 17:45:47 +00:00
Paul B Mahol
9521236881 avcodec/libfdk-aacdec: remove redundant log messages 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-07 14:55:35 +00:00
Paul B Mahol
315e3cf047 avcodec/hnm4video: remove redundant log message 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-07 14:04:21 +00:00
Michael Niedermayer
cbe84b4ffa avformat/astdec: sanity check channels & sample rate 
Fixes probetest failure

Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-07 14:58:34 +01:00
kowalsky
4684539c91 avformat/hls: fixed bug where custom http headers weren't kept for hls streams 
See: https://trac.ffmpeg.org/ticket/3024
 2013-11-07 12:29:45 +01:00
Diego Biurrun
86f910806b Remove #undefs for formerly forbidden system functions 
The macros forbidding the system functions no longer exist, obviating
the need for the #undefs.
 2013-11-07 00:26:15 +01:00
Michael Niedermayer
ea6331b2c6 avfilter/af_aresample: Calculate output buffer size more precisely. 
Fixes accumulation of data in case of significant silence injections

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-06 23:54:02 +01:00
Diego Biurrun
cffecc0e7e avfilter/graphparser: Directly free filter memory if initialization fails 2013-11-06 22:06:15 +01:00
Michael Niedermayer
3e6b7bbce5 avformat/segafilm: check 2nd tag 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-06 12:56:42 +01:00
Michael Niedermayer
ff1d81b08c avformat/swfdec: check version and size during probing 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-06 12:44:02 +01:00
Michael Niedermayer
7b7697646b avformat/rsd: increase probe score, as misdetections are fixed 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-06 11:57:57 +01:00
Michael Niedermayer
50a3c4c5d2 avformat/rsd: Check channels and sample_rate fields 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-06 11:57:57 +01:00
Michael Niedermayer
a35e30b672 avformat/libgme: decrease score by 1, fixes probetest failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-06 11:57:48 +01:00
Michael Niedermayer
1b3d3a9c87 Merge remote-tracking branch 'cus/stable' 
* cus/stable:
  ffplay: add smarter method for determining video picture duration
  ffplay: add frame duration estimated from frame rate to VideoPicture
  ffplay: avoid code duplication in AVFILTER enabled and disabled case

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-06 10:59:03 +01:00
Michael Niedermayer
66872161cb avutil/common: error out with clear message if __STDC_CONSTANT_MACROS is not defined with c++ 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-05 22:10:02 +01:00
Michael Niedermayer
6cfaf9cde8 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: Move -Wno-maybe-uninitialized check into gcc section

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-05 21:58:44 +01:00
Marton Balint
5ecfcc7dff ffplay: add smarter method for determining video picture duration 
- consider it an invalid PTS when the next PTS value is the same as the current one
- in case of invalid or unknown PTS, return vp->duration

This fixes ffplay part of ticket #3005.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-11-05 21:27:07 +01:00
Marton Balint
61dd319770 ffplay: add frame duration estimated from frame rate to VideoPicture 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-11-05 21:27:07 +01:00
Marton Balint
105d4748cf ffplay: avoid code duplication in AVFILTER enabled and disabled case 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-11-05 21:27:06 +01:00
Clément Bœsch
87434cf373 avcodec/vp9: add ff_vp9_idct_idct_{4x4,8x8}_ssse3(). 
1789 decicycles in idct_idct_4x4_add_c, 262136 runs, 8 skips
1839 decicycles in idct_idct_4x4_add_c, 524270 runs, 18 skips
1864 decicycles in idct_idct_4x4_add_c, 1048548 runs, 28 skips

529 decicycles in ff_vp9_idct_idct_4x4_add_ssse3, 262138 runs, 6 skips
516 decicycles in ff_vp9_idct_idct_4x4_add_ssse3, 524282 runs, 6 skips
474 decicycles in ff_vp9_idct_idct_4x4_add_ssse3, 1048565 runs, 11 skips

(~3.9x faster)

7726 decicycles in idct_idct_8x8_add_c, 1048433 runs, 143 skips
7732 decicycles in idct_idct_8x8_add_c, 2096882 runs, 270 skips
7731 decicycles in idct_idct_8x8_add_c, 4193772 runs, 532 skips

1145 decicycles in ff_vp9_idct_idct_8x8_add_ssse3, 1048549 runs, 27 skips
1137 decicycles in ff_vp9_idct_idct_8x8_add_ssse3, 2097097 runs, 55 skips
1086 decicycles in ff_vp9_idct_idct_8x8_add_ssse3, 4194188 runs, 116 skips

(~7.1x faster)

Overall decode time before commit:
  16.48s user 0.03s system 99% cpu 16.526 total
  16.54s user 0.01s system 99% cpu 16.566 total
  16.46s user 0.03s system 99% cpu 16.511 total

Overall decode time after commit:
  16.34s user 0.02s system 99% cpu 16.378 total
  16.28s user 0.02s system 99% cpu 16.315 total
  16.32s user 0.03s system 99% cpu 16.366 total

Tested on i7 920 with 40s 1080p footage.
 2013-11-05 19:25:40 +01:00
Lenny Wang
89a3be8921 avfilter/opencl: compile kernels separately 
Reviewed-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-05 14:29:55 +01:00
Lenny Wang
6682554790 avutil/opencl: compile kernels separately 
Reviewed-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-05 14:29:55 +01:00
Paul B Mahol
e3f384b428 avcodec/mss2: use init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-05 13:19:30 +00:00
Paul B Mahol
82f5c4d737 avcodec/flashsv: use av_freep() for tmpblock 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-05 13:19:30 +00:00
Paul B Mahol
b79f543c58 avcodec/mss1: use init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-05 13:19:30 +00:00
Stefano Sabatini
2a6c95d85f lsws/utils: introduce scale_algorithms array 
Allow some dumb factorizations, slightly decrease spaghetti factor.
 2013-11-05 14:01:53 +01:00
Paul B Mahol
c3311515d5 avcodec/flashsv: fix typo 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-05 12:44:52 +00:00
Paul B Mahol
ad1dfe04a1 avcodec/tscc2: use init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-05 12:44:20 +00:00
Paul B Mahol
290be34a74 avcodec/brender_pix: stop calling av_image_check_size() twice 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-05 12:37:52 +00:00
Paul B Mahol
6e094f7026 avcodec/flashsv: stop using deprecated avcodec_set_dimensions 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-05 12:36:24 +00:00
Paul B Mahol
22c00962c2 avcodec/flashsv: use init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-05 12:31:18 +00:00
Paul B Mahol
1a244c22ea avcodec/brender_pix: stop using deprecated avcodec_set_dimensions 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-05 12:26:58 +00:00
Paul B Mahol
7722ae35eb avcodec/c93: stop using deprecated avcodec_set_dimensions 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-05 12:24:39 +00:00
Diego Biurrun
92352a94c1 configure: Move -Wno-maybe-uninitialized check into gcc section 
As another example of bizarre compiler behavior clang groks the
-Wmaybe-uninitialized option, but not -Wno-maybe-uninitialized
and spews a warning for every file that gets compiled.
 2013-11-05 12:22:48 +01:00
Michael Niedermayer
be74cb5159 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avfilter/buffer: Suppress deprecation warning for avfilter_unref_buffer

Conflicts:
	libavfilter/buffer.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-05 12:17:35 +01:00
Michael Niedermayer
6a7de2361b Merge commit '82c86d0b1839b01b3cd0dd848fb6416ff21506dd' 
* commit '82c86d0b1839b01b3cd0dd848fb6416ff21506dd':
  graph2dot: Add missing #include for av_get_channel_layout_string()

See: 1acd2f6ba7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-05 12:15:44 +01:00
Michael Niedermayer
de970d49fe Merge commit '48715285f69d70879353737d7bed049f89f58096' 
* commit '48715285f69d70879353737d7bed049f89f58096':
  graph2dot: Fix use of deprecated API

See: 59360cd456
See: ecade984ac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-05 12:07:32 +01:00
Michael Niedermayer
e1459f4b0b Merge commit '70cbf33405f50dfaf77e85f382a188acf17dc71a' 
* commit '70cbf33405f50dfaf77e85f382a188acf17dc71a':
  vdpau: Add missing #includes to fix standalone header compilation

Conflicts:
	libavcodec/vdpau_internal.h

Not completely merged as this would break use of vdpau.h from C++

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-05 11:14:29 +01:00
Michael Niedermayer
934e489ee8 Merge commit 'e2b5b097898c9155f4bdff4d83cdc54d5eef6930' 
* commit 'e2b5b097898c9155f4bdff4d83cdc54d5eef6930':
  x86: rv40dsp: Use PAVGB instruction macro where appropriate

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-05 10:26:07 +01:00
Michael Niedermayer
04047b6166 avformat/http: print http headers at AV_LOG_DEBUG level 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-05 01:38:08 +01:00