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

74519 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mariusz Szczepańczyk
ee44cb3c81 lavf/ftp: properly read an empty path 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-10 18:23:40 +02:00
Lukasz Marek
bc93053161 lavf/ftp: implement directory listing callbacks 
Signed-off-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-10 18:23:35 +02:00
Michael Niedermayer
b26497f824 avcodec/mjpegenc_common: do not ignore the color_range field 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-10 17:48:43 +02:00
Paul B Mahol
7a7ca3cc2f avfilter/vsrc_testsrc: smpte(hd)bars: fix uninitialized last rows and columns of chroma planes 
For cases width and/or height is not multiple of chroma subsamplings.
 2015-08-10 11:29:39 +02:00
Hendrik Leppkes
10ea06b3bb Merge commit '5f200bbf98efe50f63d0515b115d2ba8dae297bc' 
* commit '5f200bbf98efe50f63d0515b115d2ba8dae297bc':
  movenc: Place the sidx index after the initial moov/mdat pair

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-10 11:24:30 +02:00
Hendrik Leppkes
7653ebfff6 Merge commit '83f254e65f938657a4dbec711e4c94252a72daf9' 
* commit '83f254e65f938657a4dbec711e4c94252a72daf9':
  movenc: Rename reserved_moov_pos to reserved_header_pos

Conflicts:
	libavformat/movenc.c
	libavformat/movenc.h

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-10 11:23:21 +02:00
Hendrik Leppkes
6c52432b48 Merge commit '8e34089e265a6b01e1e3301e8864439d26793753' 
* commit '8e34089e265a6b01e1e3301e8864439d26793753':
  movenc: Check that frag_info entries exist in mov_write_sidx_tag

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-10 11:20:09 +02:00
Hendrik Leppkes
e1def4ffec Merge commit '1542ec96389f32e5081c6c607e4b6f5e257ccdf2' 
* commit '1542ec96389f32e5081c6c607e4b6f5e257ccdf2':
  cosmetics: Drop spurious spaces from if clauses

Conflicts:
	libavcodec/vc1_block.c

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-10 11:16:27 +02:00
Hendrik Leppkes
b1d547fe02 Merge commit '0f562f5b833d603e04123d198c59f8b2b5eb43e4' 
* commit '0f562f5b833d603e04123d198c59f8b2b5eb43e4':
  h264: Do not print an error when the buffer has to be refilled

Conflicts:
	libavcodec/h264.c

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-10 11:11:42 +02:00
Martin Storsjö
5f200bbf98 movenc: Place the sidx index after the initial moov/mdat pair 
For fragmented files with non-empty moov, with a fragment index
(sidx), place the index after the initial moov/mdat pair.

Previously, for this pathological case, the index was written
at the start of the file.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-08-10 09:46:14 +03:00
Martin Storsjö
83f254e65f movenc: Rename reserved_moov_pos to reserved_header_pos 
The same field is also used for writing the sidx index header,
for fragmented files, when the faststart flag is used.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-08-10 09:46:07 +03:00
Martin Storsjö
8e34089e26 movenc: Check that frag_info entries exist in mov_write_sidx_tag 
This fixes crashes with pathological cases when trying to write
a sidx index (via the -movflags faststart option, in combination
with fragmenting options), when no fragments actually have been
written. (This is possible if the empty_moov flag isn't used,
so that all actual packet data is written in the moov/mdat pair,
and no moof/mdat pairs have been written.)

In these pathological cases, no sidx should be written at all.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-08-10 09:46:03 +03:00
Michael Niedermayer
46f15de8a4 avformat/gifdec: correct r_frame_rate for single frame gifs 
Fixes Ticket4650

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-10 04:45:27 +02:00
Michael Niedermayer
8c75a33812 postproc: Deprecate QP_STORE_T, it lacks a PP/AV/FF prefix 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-10 02:33:25 +02:00
Michael Niedermayer
0eb896b38d Revert "movtextdec: Use default style information from movtext header" 
The commit broke  sub-movtext and sub-subripenc
fate output differs between mips ad x86 so updating fate ref is not
possible

This reverts commit d670848d4c.
 2015-08-10 02:09:14 +02:00
Niklesh
d670848d4c movtextdec: Use default style information from movtext header 
Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
 2015-08-09 15:12:15 -07:00
Marton Balint
8628b06b31 ffplay: increase MIN_FRAMES to 25 
FFplay was using a 5 frame packet buffer, this is not much (e.g. 200 ms for
25fps video), when HLS is requesting a new segment via HTTP, it may take longer
for the request to complete.

Should fix ticket #4720.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2015-08-09 23:58:03 +02:00
Marton Balint
0166d329c3 ffplay: add specific constants for buffer fullness settings when using external clock 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2015-08-09 23:57:51 +02:00
周晓勇
7fbafd0b1b avcodec: loongson optimize h264qpel with mmi v1 
Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-09 20:43:54 +02:00
Michael Niedermayer
0f9d46b70d swscale/alphablend: Support chroma subsampling 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-09 18:04:46 +02:00
Michael Niedermayer
c5ebeaa308 swscale/alphablend: Support SWS_ALPHA_BLEND_CHECKERBOARD 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-09 17:11:53 +02:00
Michael Niedermayer
87100e828a swscale/alphablend: Factor target computation out of the loops 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-09 16:09:30 +02:00
Michael Niedermayer
f28ba31b1b swscale/alphablend: Fix big endian formats on LE 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-09 15:59:12 +02:00
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
Paolo Bizzarri
1542ec9638 cosmetics: Drop spurious spaces from if clauses 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-08-08 01:26:38 +02: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