x/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-08-05 05:20:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,334 Commits 40 Branches 430 Tags
62b39d41cdec2be4e4722aefbd7789305e4ab2ad
Commit Graph
41334 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefano Sabatini 62b39d41cd lavc: add pkt_duration field to AVFrame 2012-06-05 18:42:17 +02:00
Stefano Sabatini 0da9bce5a3 lavfi: move avfilter_copy_frame_props() definition from buffer.c to avcodec.c 
The new location is more suited, as it is where the lavfi/lavc glue is
defined.
 2012-06-05 18:39:47 +02:00
Andrew WasonandMichael Niedermayer c527027c27 aconvert filter needs to configure samplerates 
I changed the *_set_common_* functions to only set unset formats, then
added a wrapper that calls them after the filters query_formats.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-05 18:15:29 +02:00
Michael Niedermayer 787c395a30 swr-test: support "--help" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-05 17:27:38 +02:00
Michael Niedermayer 63b1c08073 buildsys: fix rules for swresample-test 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-05 17:27:38 +02:00
Michael Niedermayer 5a7a9f02de libswresample/Makefile: put each object on its own line 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-05 17:27:38 +02:00
Paul B Mahol 02827a3c99 swscale: RGBA64LE <-> RGBA64BE support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-06-05 12:18:30 +00:00
Nicolas George aba8065adb avfiltergraph: call query_formats on inputs first. 
This is a temporary workaround for amerge,
until format renegociation is implemented.

Should fix trac ticket #1400.
 2012-06-05 13:26:34 +02:00
Nicolas George 6a4c5c730e avfiltergraph: check query_formats return value. 2012-06-05 13:26:34 +02:00
Carl Eugen Hoyos a3bc7f916d Make H264 reorder buffer size message less verbose. 2012-06-05 12:52:07 +02:00
Piotr BandurskiandCarl Eugen Hoyos 48fdaa1cff snowdec: add new line to some error messages 2012-06-05 12:15:18 +02:00
Piotr BandurskiandCarl Eugen Hoyos a489db6cde isom: add Radius DV YUV FourCCs 2012-06-05 12:13:39 +02:00
Stefano Sabatini 1488c4dc0b lavfi: move tracing utilities definition from video.c to avfilter.c 
These utilities are meant to be defined in avfilter.c, since they are
generic and thus contain both audio and video code.
 2012-06-05 11:52:47 +02:00
Carl Eugen Hoyos 1faf0d6a7a Add missing CRLFs to avisynth error messages. 2012-06-05 11:13:30 +02:00
Carl Eugen Hoyos 757d5b9bfd Fix MP2 muxer Makefile dependencies. 
Found, analysed and tested by trac user Jamal.

Fixes ticket #1411
 2012-06-05 09:54:03 +02:00
Clément Bœsch 44be67595d lavfi/select: use exported dsputil_init function. 
This is the deprecated version of the function but it is exported, so it
should fix the shared FATE box.
 2012-06-05 07:29:00 +02:00
Michael BradshawandMichael Niedermayer 1b27b8bf6c MANGLEd swscale x86 asm to save registers 
register starvation caused gcc4.2 to fail building 32 bit shared libs
on 64 bit OS X

Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-05 03:02:41 +02:00
Andrew WasonandMichael Niedermayer 1ef802d038 update filtering_audio example 
The filtering_audio.c example needs to be updated for the new
"abuffer" filter args.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-05 03:02:41 +02:00
Clément Bœsch 13a7bd70c8 lavfi/select: 10l: llabs -> fabs after switching types. 2012-06-05 00:17:38 +02:00
Michael Niedermayer 9c4821ca7b Merge remote-tracking branch 'cus/stable' 
* cus/stable:
  ffplay: calculate audio diff threshold based on the actual settings
  ffplay: try more channel count combinations for SDL_OpenAudio
  ffplay: simplify audio_open, rename parameters to more explanatory names
  ffplay: remove VideoState from audio_open
  ffplay: put audio parameters to their own struct
  ffplay: put audio_open into a seperate function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-04 23:35:42 +02:00
Michael Niedermayer 944d049eaa Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  movenc: Write chan atom for all audio tracks in mov mode movies.
  mpegtsenc: use avio_open_dyn_buf(), zero pointers after freeing
  doc/avconv: add some details about the transcoding process.
  avidec: make scale and rate unsigned.
  avconv: check output stream recording time before each frame returned from filters
  avconv: split selecting input file out of transcode().
  avconv: split checking for active outputs out of transcode().
  avfiltergraph: make some functions static.

Conflicts:
	ffmpeg.c
	libavfilter/avfiltergraph.c
	libavfilter/internal.h
	libavformat/mpegtsenc.c
	tests/ref/fate/acodec-alac
	tests/ref/fate/acodec-pcm-s16be
	tests/ref/fate/acodec-pcm-s24be
	tests/ref/fate/acodec-pcm-s32be
	tests/ref/fate/acodec-pcm-s8
	tests/ref/lavf/mov

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-04 22:59:32 +02:00
Clément Bœsch df03ae8dd8 ffmpeg: remove two unused variables. 2012-06-04 22:32:26 +02:00
Clément Bœsch 5e8225004f Changelog: add ffprobe flat output. 2012-06-04 21:46:24 +02:00
Clément Bœsch 72868144e5 lavfi/select: add scene detection. 
Based on the shotdetect algorithm (http://shotdetect.nonutc.fr/ by Johan
MATHE johan.mathe tremplin-utc.net).
 2012-06-04 21:44:34 +02:00
Carl Eugen Hoyos 6b87f0707d Do not try to encode DVCPRO HD, it produces broken files. 2012-06-04 20:42:00 +02:00
Carl Eugen Hoyos 0a3e15690f Allow colour space autodetection when encoding ljpeg. 
This works as expected if the input stream is not yuv4xxp.

Reviewed-by: Paul B Mahol
 2012-06-04 20:01:39 +02:00
Carl Eugen Hoyos 02c2a54bf6 Remove misplaced comment. 2012-06-04 20:01:36 +02:00
Clément Bœsch bae99f7651 ffprobe/flat: add escape for '`' and '$'. 2012-06-04 19:15:39 +02:00
Alex Converse 41e9682af2 movenc: Write chan atom for all audio tracks in mov mode movies. 2012-06-04 10:08:31 -07:00
Michael Niedermayer 02ff89a1cd ffmpeg: disable audio volume insertion on the output side. 
This fixes -vol leading to 2 inserted volume filters

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-04 15:49:03 +02:00
Jindřich MakovičkaandMartin Storsjö 84e430dd7b mpegtsenc: use avio_open_dyn_buf(), zero pointers after freeing 
Per suggestion by Michael Niedermayer.

Signed-off-by: Jindřich Makovička <makovick@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-06-04 15:41:09 +03:00
Anton Khirnov 2b1f105f1b doc/avconv: add some details about the transcoding process. 2012-06-04 14:22:16 +02:00
Anton Khirnov a982e5a031 avidec: make scale and rate unsigned. 
The specs say they are unsigned 32bit integers.
 2012-06-04 14:18:49 +02:00
Anton Khirnov bb7431f4fc avconv: check output stream recording time before each frame returned from filters 
There may be multiple frames returned, so with just one check we can
write more than requested to the output.
 2012-06-04 14:18:34 +02:00
Anton Khirnov a508e7a1ff avconv: split selecting input file out of transcode(). 2012-06-04 14:18:18 +02:00
Anton Khirnov 2f51ec2b94 avconv: split checking for active outputs out of transcode(). 2012-06-04 14:17:52 +02:00
Anton Khirnov 8eb9bf0933 avfiltergraph: make some functions static. 
They are not used outside of avfiltergraph.c
 2012-06-04 14:17:39 +02:00
Paul B Mahol b0f6df28de libopenjpeg: YUV410P and YUV411P support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-06-04 11:44:04 +00:00
Carl Eugen Hoyos 568a592418 Fix compilation condition for some ProRes dsp encoder functions. 
Found, analysed and tested by trac user Jamal.

Fixes part of Ticket #1404.
 2012-06-04 12:18:56 +02:00
Carl Eugen Hoyos 84986b4e61 Fix compilation condition for some ProRes dsp decoder functions. 
Found, analysed and tested by trac user Jamal.

Fixes part of Ticket #1404.
 2012-06-04 12:15:41 +02:00
Carl Eugen Hoyos a4b885d55e Fix ProRes decoder Makefile dependencies. 
Found, analysed and tested by trac user Jamal.

Fixes part of Ticket #1404.
 2012-06-04 12:07:30 +02:00
Carl Eugen Hoyos c02ef07881 Fix G.723.1 encoder Makefile dependencies. 2012-06-04 12:06:48 +02:00
Clément BœschandClément Bœsch c790ae0265 ffmpeg: add missing return carriage in error message. 2012-06-04 09:10:07 +02:00
Clément BœschandClément Bœsch e00b2d284e options: stop after option is found. 
This reverts 78da04384a6c22820518706d84631006d31a85ea; it is not
required anymore since the previous commit (these extended checks were
for the -timecode option in both muxers and encoders), and reduces the
diff with the fork.
 2012-06-04 07:41:22 +02:00
Clément BœschandClément Bœsch 6b35f1a2a6 timecode: move timecode muxer options to metadata. 
Some demuxers set a timecode in the format or streams metadata. The
muxers now make use of this metadata instead of a duplicated private
option.

This makes possible transparent copy of the timecode when transmuxing
and transcoding.

-timecode option for MPEG1/2 codec is also renamed to -gop_timecode. The
global ffmpeg -timecode option will set it anyway so no option change
visible for the user.
 2012-06-04 07:41:22 +02:00
Stefano Sabatini 0f0f3bd1e0 lavfi: use av_default_item_name() as filter private context logger 
avfilter_default_filter_name() is supposed to access an AVFilterContext
struct, if used with a private struct it will cause a crash since it will
access fields which are non defined in the private struct.
 2012-06-04 02:40:01 +02:00
Michael Niedermayer 38c9ebd2a9 ffv1dec: print more information for -debug 1 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-04 01:04:03 +02:00
Michael Niedermayer 730d079bf7 ffv1: fix log level of FF_DEBUG_PICT_INFO 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-04 01:04:03 +02:00
Stefano Sabatini f1add01d98 ffmpeg: be more verbose when printing an error in transcode() 
Helps debuggability.
 2012-06-04 00:55:08 +02:00
Stefano Sabatini 6a9854e8f4 ffmpeg: specify more meaningful names for the lavfi buffer sources 2012-06-04 00:55:02 +02:00