generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
52,685 Commits 24 Branches 241 Tags 173 MiB
6190aae90d
Commit Graph

52685 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
1a94d7c7c8 avfilter/trim: improve rounding precission 
Note, the design is still flawed, dont expect this to be frame
accurate. float/double first needs to be removed and frames
itself trimmed instead of drop vs nodrop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-01 13:55:30 +02:00
Clément Bœsch
24939d567b fate/pixfmts: use the appropriate variable names for temporary files. 
${1} is now the filter args and is inappropriate as a unique name for
the test (and causes some FATE issues because of the ':' in them).
${filter} is not used either to replace the ${1} because ${outfile}
already contains a unique name for the test.
 2013-05-01 13:25:42 +02:00
Michael Niedermayer
1924a61a0a Merge commit '3d624420086ed3cd0c74f4510f0285968e21c117' 
* commit '3d624420086ed3cd0c74f4510f0285968e21c117':
  avconv_opt: allocate an OutputFile before the streams.

Conflicts:
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-01 12:09:07 +02:00
Nicolas George
ceb33f3aee lavc: copy subtitle_header when copying context. 
Fix trac ticket #2489.
 2013-05-01 11:56:34 +02:00
Nicolas George
276fcbde6c lavf: data muxer and demuxer. 
Allow to use tools designed to work with demuxers, muxers
and packets (for example ffmpeg itself) to process raw byte
streams (like aviocat).
 2013-05-01 11:56:34 +02:00
Michael Niedermayer
3319679d0a Merge commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876' 
* commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876':
  lavfi: add trim and atrim filters.

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/allfilters.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-01 11:34:34 +02:00
Michael Niedermayer
1cba7fa364 Merge commit 'b472938233b98178ed6c1353c37e0dc7ab585902' 
* commit 'b472938233b98178ed6c1353c37e0dc7ab585902':
  lavfi: add an asetpts filter

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavfilter/f_setpts.c
	libavfilter/setpts.c
	libavfilter/version.h
	libavfilter/vf_setpts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-01 10:59:21 +02:00
Michael Niedermayer
0061ba044a Merge commit '2548834b2248ad4d7da9bd0afed09d7d0cddeeb0' 
* commit '2548834b2248ad4d7da9bd0afed09d7d0cddeeb0':
  vf_setpts: cosmetics, reformat

Conflicts:
	libavfilter/f_setpts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-01 10:24:45 +02:00
Michael Niedermayer
e41d3aba01 Merge commit 'c22263d3e813d442df8fa5f5ba8993573fe775d8' 
* commit 'c22263d3e813d442df8fa5f5ba8993573fe775d8':
  graphparser: only print filter arguments if they are non-NULL
  af_channelmap: ensure the output channel layout is valid.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-01 10:16:31 +02:00
Michael Niedermayer
a1b8879714 Merge commit '949c603ed9210df0e1b8e1aa82c71b93543d8071' 
* commit '949c603ed9210df0e1b8e1aa82c71b93543d8071':
  af_channelmap: remove now unnecessary goto
  vf_split: fix description

Conflicts:
	libavfilter/split.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-01 10:11:01 +02:00
Michael Niedermayer
52fa2945b5 Merge commit 'e036bb7899d0faca9159206be9bf5552e76e7633' 
* commit 'e036bb7899d0faca9159206be9bf5552e76e7633':
  lavc: clear AVBuffers on decoded frames if refcounted_frames is not set
  FATE: add an additional indeo3 test

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-01 10:00:08 +02:00
Michael Niedermayer
d8b6557c86 Merge commit 'bda9e6d923df6d46cc5cafb30a59a01d2514fa61' 
* commit 'bda9e6d923df6d46cc5cafb30a59a01d2514fa61':
  indeo3: use put_pixels instead of put_no_rnd_pixels in copy_cell()

Conflicts:
	libavcodec/indeo3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-01 09:51:37 +02:00
Michael Niedermayer
71091698a2 Merge commit '95220be1faac628d849a004644c0d102df0aa98b' 
* commit '95220be1faac628d849a004644c0d102df0aa98b':
  indeo3: fix off by one in MV validity check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-01 09:45:09 +02:00
Clément Bœsch
14f45bcbe7 doc/filters: fix scale example equivalence. 
scale=w=200:h=100 and scale=w=200:h=100 are of course equivalent...
 2013-05-01 04:46:14 +02:00
Clément Bœsch
e3e66568cc doc/filters: replace hqdn3d with smartblur in timeline section. 
hqdn3d needs some adjustements before timeline support can be restored
(patch welcome).
 2013-05-01 04:44:27 +02:00
Michael Niedermayer
fbaf75b166 h264: Use the correct croping values. 
This fixes returning pictures with corrupted data pointers.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-01 00:06:26 +02:00
Michael Niedermayer
5299ee54a7 h264: assert that croping values at slice level are consistent 
These values where checked before already.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-30 23:49:56 +02:00
Michael Niedermayer
c3bd306e78 h264_ps: check croping values 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-30 23:48:53 +02:00
Michael Niedermayer
7edb984dd0 avutil/log: Fix context pointer used for get_category() 
Fixes calling a random pointer

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-30 20:06:24 +02:00
Derek Buitenhuis
af8a47905a avutil: doxy: Small clarification for av_buffer_create() 
Explicitly saying it can't hurt.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-04-30 13:33:43 -04:00
Derek Buitenhuis
00b8e650e8 avcodec: doxy: Clarify how to use buf[] when implementing get_buffer2() 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-04-30 13:33:43 -04:00
Derek Buitenhuis
4cdb3c50b5 avcodec: doxy: Clarify what get_buffer2 must fill in buf[] 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-04-30 13:32:58 -04:00
Diego Biurrun
e926b5ceb1 avformat: Drop unnecessary ff_ name prefixes from static functions 2013-04-30 16:16:23 +02:00
Diego Biurrun
7f75f2f2bd ppc: Drop unnecessary ff_ name prefixes from static functions 2013-04-30 16:10:06 +02:00
Diego Biurrun
f2e9d44a57 x86: Drop unnecessary ff_ name prefixes from static functions 2013-04-30 16:02:03 +02:00
Diego Biurrun
383fd4d478 arm: Drop unnecessary ff_ name prefixes from static functions 2013-04-30 16:02:03 +02:00
Diego Biurrun
088f38a4f9 avcodec: Drop unnecessary ff_ name prefixes from static functions 2013-04-30 16:02:02 +02:00
Michael Niedermayer
53efb2fa09 gif: Fix little endian specific code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-30 13:35:14 +02:00
Michael Niedermayer
147a45fca4 framecrcenc: workaround design flaw in sidedata palette 
This should be reverted once palettes are dealt with in a endian independant way
in packets

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-30 13:35:14 +02:00
Paul B Mahol
a0adeb1f9f fate: add test for separatefields filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-30 10:22:16 +00:00
Diego Biurrun
38282149b6 ppc: More consistent arch initialization 2013-04-30 12:19:45 +02:00
Diego Biurrun
42b9150b0d fft: Remove pointless #ifdefs around function declarations 2013-04-30 12:19:44 +02:00
Diego Biurrun
f5eecee865 ppc: util_altivec: Surround AltiVec-related code by appropriate ifdefs 
This prevents non-AltiVec-enabled compilers from choking.
 2013-04-30 12:19:44 +02:00
Diego Biurrun
a053dbfcfb ppc: Move AltiVec utility headers out of AltiVec ifdefs 
Now that the headers themselves have ifdef protection this is no
longer necessary and more consistent with normal include handling.
 2013-04-30 12:19:44 +02:00
Diego Biurrun
6b110d3a73 ppc: More consistent names for H.264 optimizations files 2013-04-30 12:19:43 +02:00
Diego Biurrun
643e433bf7 mpegaudiosp: More consistent names for ppc/x86 optimization files 2013-04-30 12:19:43 +02:00
Paul B Mahol
468ec1714c fate: add test for swapuv filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-30 10:18:45 +00:00
Paul B Mahol
e85f02e3f5 fate: add test for telecine filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-30 10:10:23 +00:00
Anton Khirnov
8cd472d3f9 avconv: make output -ss insert trim/atrim filters. 
This makes output -ss sample-accurate for audio and will allow further
simplication in the future.
 2013-04-30 12:00:55 +02:00
Anton Khirnov
a83c0da539 avconv: make -t insert trim/atrim filters. 
This makes -t sample-accurate for audio and will allow further
simplication in the future.

Most of the FATE changes are due to audio now being sample accurate. In
some cases a video frame was incorrectly passed with the old code, while
its was over the limit.
 2013-04-30 11:53:12 +02:00
Anton Khirnov
3d62442008 avconv_opt: allocate an OutputFile before the streams. 
This way OutputFile variables like recording time can be used when
creating the streams.
 2013-04-30 11:48:23 +02:00
Anton Khirnov
a1e05b0487 lavfi: add trim and atrim filters. 2013-04-30 11:24:57 +02:00
Anton Khirnov
b472938233 lavfi: add an asetpts filter 2013-04-30 11:17:57 +02:00
Anton Khirnov
2548834b22 vf_setpts: cosmetics, reformat 2013-04-30 11:17:23 +02:00
Anton Khirnov
c22263d3e8 graphparser: only print filter arguments if they are non-NULL 2013-04-30 11:16:57 +02:00
Anton Khirnov
8aaab1113c af_channelmap: ensure the output channel layout is valid. 2013-04-30 11:16:37 +02:00
Anton Khirnov
949c603ed9 af_channelmap: remove now unnecessary goto 
Options are freed from the generic code now, there is no need to call
av_opt_free() from the filter.
 2013-04-30 11:16:22 +02:00
Anton Khirnov
1012155722 vf_split: fix description 
It now allows an arbitrary number of inputs, not just two.
 2013-04-30 11:16:16 +02:00
Anton Khirnov
e036bb7899 lavc: clear AVBuffers on decoded frames if refcounted_frames is not set 
Otherwise some code might mistakenly think it is allowed to unref those
buffers, which would lead to double unref.
 2013-04-30 11:15:32 +02:00
Paul B Mahol
2bdd434931 lavfi/stereo3d: add support for alternating frames input & output format 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-30 09:13:36 +00:00