virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
Code Issues Releases Activity
64,434 Commits 37 Branches 400 Tags
Commit Graph

64434 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carl Eugen Hoyos
d538dd824e avformat: Add image3 demuxers with format autodetection 
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-03 18:14:06 +02:00
James Zern
dea377fcc0 ivfenc: support VP9 
libvpx tools accept vp9 ivf files

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-03 15:46:26 +02:00
Leandro Santiago
4582e1162a avfilter/vf_drawtext: fix resource leak 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-03 15:45:15 +02:00
Michael Niedermayer
a3c479fc49 avformat/avformat: minor grammar improvement 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-03 13:51:53 +02:00
Michael Niedermayer
44f079b27e Merge commit 'cdab9db2adeec46b3984309c8c651bdd737d2b6b' 
* commit 'cdab9db2adeec46b3984309c8c651bdd737d2b6b':
  lavf: document av_dump_format()

Conflicts:
	libavformat/avformat.h

See: 61f96be08a66e74897406fd64da4e61ea4b6a8c5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-03 13:39:23 +02:00
Michael Niedermayer
982920cfaa Merge commit 'df949b645b12d62bb4da56d629a887c81f67f2e5' 
* commit 'df949b645b12d62bb4da56d629a887c81f67f2e5':
  hevc: Use the local context variable when needed

Conflicts:
	libavcodec/hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-03 13:19:34 +02:00
Michael Niedermayer
33f6ba9c4e avdevice/pulse_audio_dec: clear pa_simple pointer after deallocation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-03 13:05:58 +02:00
Paul B Mahol
b52c26c66f avfilter: add flanger filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-07-03 08:07:42 +00:00
Paul B Mahol
7e8c1f0c38 avfilter/af_aphaser: move wave table generation code into separate file 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-07-03 07:34:11 +00:00
Vittorio Giovara
cdab9db2ad lavf: document av_dump_format() 2014-07-02 23:37:21 -04:00
Luca Barbato
df949b645b hevc: Use the local context variable when needed 2014-07-02 23:30:49 -04:00
Michael Niedermayer
1265247206 avfilter/vf_format: Check pix_fmts before dereferencing it 
Fixes CID1224286

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-03 02:29:49 +02:00
Michael Niedermayer
5ab67340f9 avfilter/avfiltergraph: dont "or" together error codes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-03 02:29:49 +02:00
Carl Eugen Hoyos
b02cfad7d2 Fix standalone compilation of the wtv muxer. 2014-07-02 23:41:29 +02:00
Michael Niedermayer
ce6a1ff2a1 avcodec/on2avc: Fix out of array access 
Fixes CID1206648

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 20:22:12 +02:00
Michael Niedermayer
61815ef85b Merge commit '98569d89638efc325042bd0081e9a02181afdafa' 
* commit '98569d89638efc325042bd0081e9a02181afdafa':
  matroskadec: Fix a double negation typo

See: 2c5b92fe90463402be6bf611ef40195f86f434fd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 20:18:16 +02:00
Anshul Maheshwari
43d70a776d avcodec: Updated comment for sub param 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 19:47:14 +02:00
Anshul Maheshwari
7d1898ebcc avcodec/dvbsubdec: removed unnecessary null check for subtitle 
In refrence to coverity defect 1224278

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 19:47:14 +02:00
Michael Niedermayer
98569d8963 matroskadec: Fix a double negation typo 
This typo has existed since this code was added in c16582579.
Newer versions of clang pointed out that this comparison always
was true (since the result of the negation is either 0 or 1, while
AVDISCARD_ALL has the value 48).

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-07-02 20:15:42 +03:00
Stefano Sabatini
462c9ee3ac lavfi/overlay: show incoming frames on debug messages 
This is especially useful to debug queue overflow issues.

Ideally we should be able to set the debug message at the
dualinput/framesync level, but they do not have the information related
to the filter context and the inlink, so cannot access much useful
information.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2014-07-02 18:42:15 +02:00
Michael Niedermayer
5307fa00a4 avcodec/dvdec: remove redundant null check 
Fixes CID700682 again

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 16:37:38 +02:00
Michael Niedermayer
d266ecff4b avcodec/bitstream: remove trivial assert 
Fixed CID1224273

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 16:25:40 +02:00
James Almer
b5f0eac068 swr: rename swresample_dsp init functions to swri_resample_dsp 
The swresample_ prefix is not for internal functions

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 13:18:30 +02:00
Dave Rice
1619a0e2b8 doc/filters: fix typo 
Signed-off-by: Dave Rice <dave@dericed.com>
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 13:09:12 +02:00
Michael Niedermayer
4930cd13d6 ffmpeg: check av_opt_set_dict() return 
Fixes CID1224275

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 05:53:13 +02:00
Dave Rice
79d3eeb2b7 doc/ffprobe.xsd: fix order and missing elements/attributes 
Signed-off-by: Dave Rice <dave@dericed.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 03:55:54 +02:00
James Almer
42a92a240d swr: remove obsolete resample prototypes 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 03:14:45 +02:00
James Almer
23a9edf531 Partially revert "swr: add prototypes for resample dsp functions" 
Prototypes are not needed anymore now that the x86 functions don't
include resample_template.c

The DO_RESAMPLE_ONE macro is removed for that same reason as well.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 03:14:36 +02:00
James Almer
c45b7f0d80 x86/swr: add ff_resample_{common, linear}_int16_xop 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 01:11:20 +02:00
James Almer
1a69224f44 x86/swr: add ff_resample_{common, linear}_float_fma 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 01:09:53 +02:00
James Almer
a441a2437b x86: rename dsputil.asm to idctdsp.asm 
Its only function is no longer part of dsputil.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 01:08:04 +02:00
Michael Niedermayer
ef7e8425e8 avcodec/mjpegdec: factorize some parts of the pix_fmt_id switch() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-01 23:28:18 +02:00
Michael Niedermayer
784e1cf76b avcodec/mjpegdec: handle luma upscale detection generically 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-01 23:26:19 +02:00
Michael Niedermayer
64d98dadc7 avcodec/mjpegdec: set upscale_h/upscale_v using generic code instead of hardcoding a list 
Some code is left to handle corner cases

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-01 22:54:57 +02:00
Michael Niedermayer
7558e55345 avcodec/mjpegdec: Support pix_fmt_id==0x11222200 
Fixes: 4858286_300.jpg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-01 22:12:20 +02:00
Michael Niedermayer
cd417d947e avcodec/mjpegdec: fix width for non chroma in rescaling 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-01 22:09:19 +02:00
Michael Niedermayer
4e09300ffa mjpegdec: Support pix_fmt_id == 0x22112200 
Fixes 4780490_300.jpg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-01 21:47:54 +02:00
Michael Niedermayer
141ee10913 Merge commit '48e6432407a73d5006d84609456e6e0bc3dd8fc4' 
* commit '48e6432407a73d5006d84609456e6e0bc3dd8fc4':
  matroska: Factor out mkv_write_stereo_mode

Conflicts:
	libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-01 20:55:42 +02:00
Michael Niedermayer
ee78b0c252 Merge commit 'b75a1f9892b5b715397edbf837e4d4cda337907b' 
* commit 'b75a1f9892b5b715397edbf837e4d4cda337907b':
  matroska: Factor out write_track from mkv_write_tracks

Conflicts:
	libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-01 20:25:35 +02:00
Michael Niedermayer
8365287e61 Merge commit 'f1f6156b3fc9eb77b439d031ba18974d80b8341e' 
* commit 'f1f6156b3fc9eb77b439d031ba18974d80b8341e':
  matroska: K&R formatting cosmetics

Conflicts:
	libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-01 19:58:57 +02:00
Michael Niedermayer
06e5d28e33 Merge commit 'd0449e754553b0c110b6cd75f6725b82144fbd2a' 
* commit 'd0449e754553b0c110b6cd75f6725b82144fbd2a':
  vaapi: Update idct_permutation location after dsputil/idctdsp split

See: 581b5f0b9b93969712e73e0ae6324bbd03e85d4e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-01 19:29:53 +02:00
James Almer
dd2c9034b1 x86/swr: convert resample_{common, linear}_double_sse2 to yasm 
Signed-off-by: James Almer <jamrial@gmail.com>

312531 -> 311528 dezicycles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-01 17:57:36 +02:00
Luca Barbato
48e6432407 matroska: Factor out mkv_write_stereo_mode 2014-07-01 16:43:20 +02:00
Luca Barbato
b75a1f9892 matroska: Factor out write_track from mkv_write_tracks 2014-07-01 16:43:01 +02:00
Luca Barbato
f1f6156b3f matroska: K&R formatting cosmetics 2014-07-01 16:42:32 +02:00
Diego Biurrun
d0449e7545 vaapi: Update idct_permutation location after dsputil/idctdsp split 2014-07-01 07:36:22 -07:00
Michael Niedermayer
fb318def5d Merge commit '20f95f21f9b9595608ba668a6eca78f2d508be67' 
* commit '20f95f21f9b9595608ba668a6eca78f2d508be67':
  mov: Support default-base-is-moof.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-01 16:31:57 +02:00
Michael Niedermayer
8d0c7031a8 Merge commit '79793f833784121d574454af4871866576c0749d' 
* commit '79793f833784121d574454af4871866576c0749d':
  Update Fiona's name in copyright statements.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-01 15:43:40 +02:00
Michael Niedermayer
581b5f0b9b Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e' 
* commit 'e3fcb14347466095839c2a3c47ebecff02da891e':
  dsputil: Split off IDCT bits into their own context

Conflicts:
	configure
	libavcodec/aic.c
	libavcodec/arm/Makefile
	libavcodec/arm/dsputil_init_arm.c
	libavcodec/arm/dsputil_init_armv6.c
	libavcodec/asvdec.c
	libavcodec/dnxhdenc.c
	libavcodec/dsputil.c
	libavcodec/dvdec.c
	libavcodec/dxva2_mpeg2.c
	libavcodec/intrax8.c
	libavcodec/mdec.c
	libavcodec/mjpegdec.c
	libavcodec/mjpegenc_common.h
	libavcodec/mpegvideo.c
	libavcodec/ppc/dsputil_altivec.h
	libavcodec/ppc/dsputil_ppc.c
	libavcodec/ppc/idctdsp.c
	libavcodec/x86/Makefile
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/dsputil_mmx.c
	libavcodec/x86/dsputil_x86.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-01 15:22:11 +02:00
Yusuke Nakamura
20f95f21f9 mov: Support default-base-is-moof. 
default-base-is-moof shall be set to track fragments compatible with DASH
Media Segments. So, this is a fundamental support for ISOBMFF ver. DASH.
This is meaningful only when base-data-offset-present is absent and two or
more track fragments are present in a movie fragment.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-07-01 14:36:06 +03:00