RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-19 05:55:07 +00:00
Code Issues Projects Releases Wiki Activity
30,513 Commits 37 Branches 400 Tags 241 MiB
e4e2db9c74
Commit Graph

30513 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baptiste Coudurier
e4e2db9c74 ffmpeg: use opt_acodec when setting audio codec in opt_target. 2011-06-03 19:52:59 -07:00
Michael Niedermayer
bfd3b70ac3 ffmpeg: fix segfault with too many output files 
Fixes Ticket219

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-04 01:24:00 +02:00
Michael Niedermayer
33af5335fd ffplay: error out with invalid sample rate or channels. 
Fixes Ticket119
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-04 00:16:12 +02:00
Michael Niedermayer
49125aeddc oggdec: fix Ticket185 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-03 21:14:30 +02:00
Michael Niedermayer
c1daf0723c j2kdec: dont fail on non zero cblock style. 
This allows decoding to continue a bit further for some files.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-03 19:41:15 +02:00
Rukhsana Ruby
58149303b3 makefile: fix j2k encoder dependancies 2011-06-03 19:41:15 +02:00
JULIAN GARDNER
f35761bca2 udp: fix indention 2011-06-03 19:41:15 +02:00
Carl Eugen Hoyos
25c32d082b cmdutils: move "#undef main" from ffplay.c to cmdutils.h 
On Windows/MinGW the SDL cflags re-define the main() function, which
results in a linking error if the define is not undeffed.

Since the addition of the SDL output device, SDL cflags are used also
for compiling ffmpeg and ffprobe, so we need to move this trick from
ffplay.c to a common header.

Fix trac issue #256.
 2011-06-03 17:03:43 +02:00
Michael Niedermayer
c9614bb22c wav: update size check for ds64 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-03 15:48:08 +02:00
Philip de Nier
e472f0ea5a wav: fix skip size at end of ds64 chunk 2011-06-03 15:48:08 +02:00
Michael Niedermayer
99eb31e263 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (25 commits)
  Replace custom DEBUG preprocessor trickery by the standard one.
  vorbis: Remove non-compiling debug statement.
  vorbis: Remove pointless DEBUG #ifdef around debug output macros.
  cook: Remove non-compiling debug output.
  Remove pointless #ifdefs around function declarations in a header.
  Replace #ifdef + av_log() combinations by av_dlog().
  Replace custom debug output functions by av_dlog().
  cook: Remove unused debug functions.
  Remove stray extra arguments from av_dlog() invocations.
  targa: fix big-endian build
  v4l2: remove one forgotten use of AVFormatParameters.pix_fmt.
  vfwcap: add a framerate private option.
  v4l2: add a framerate private option.
  libdc1394: add a framerate private option.
  fbdev: add a framerate private option.
  bktr: add a framerate private option.
  oma: check avio_read() return value
  nutdec: remove unused variable
  Remove unused variables
  swscale: allocate larger buffer to handle altivec overreads.
  ...

Conflicts:
	ffmpeg.c
	libavcodec/dca.c
	libavcodec/dirac.c
	libavcodec/error_resilience.c
	libavcodec/h264.c
	libavcodec/mpeg12.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pthread.c
	libavcodec/rv10.c
	libavcodec/s302m.c
	libavcodec/shorten.c
	libavcodec/truemotion2.c
	libavcodec/utils.c
	libavdevice/dv1394.c
	libavdevice/fbdev.c
	libavdevice/libdc1394.c
	libavdevice/v4l2.c
	libavformat/4xm.c
	libavformat/apetag.c
	libavformat/asfdec.c
	libavformat/avidec.c
	libavformat/mmf.c
	libavformat/mpeg.c
	libavformat/mpegenc.c
	libavformat/mpegts.c
	libavformat/oggdec.c
	libavformat/oggparseogm.c
	libavformat/rl2.c
	libavformat/rmdec.c
	libavformat/rpl.c
	libavformat/rtpdec_latm.c
	libavformat/sauce.c
	libavformat/sol.c
	libswscale/utils.c
	tests/ref/vsynth1/error
	tests/ref/vsynth2/error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-03 05:19:30 +02:00
Michael Niedermayer
9034001b17 h264 fill_filter_caches: Dont init chroma nnz_cache. 
Found-by: Dark Shikari
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-03 03:46:13 +02:00
Baptiste Coudurier
dd47107021 In print_report, print progression time in hours:mins:secs:us 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-03 03:46:13 +02:00
Baptiste Coudurier
1212d5b5e4 ffmpeg: In print_report, use int64_t for pts to check for 0 and avoid inf value for bitrate. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-03 03:46:13 +02:00
Baptiste Coudurier
5aa70309ad In libswscale, use all lines when converting from 422p to rgb with mmx, improve quality. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-03 03:46:13 +02:00
Diego Biurrun
f190f676bc Replace custom DEBUG preprocessor trickery by the standard one. 2011-06-03 00:44:06 +02:00
Diego Biurrun
068aa38712 vorbis: Remove non-compiling debug statement. 2011-06-03 00:44:05 +02:00
Diego Biurrun
ec6313ad86 vorbis: Remove pointless DEBUG #ifdef around debug output macros. 2011-06-03 00:44:04 +02:00
Diego Biurrun
fb52cf8267 cook: Remove non-compiling debug output. 
random_state was changed from an int to a struct and can no longer be printed
as easily as before.
 2011-06-03 00:44:04 +02:00
Diego Biurrun
0fc9c6554e Remove pointless #ifdefs around function declarations in a header. 2011-06-03 00:44:04 +02:00
Diego Biurrun
2366462429 Replace #ifdef + av_log() combinations by av_dlog(). 2011-06-03 00:44:03 +02:00
Diego Biurrun
df96f22d8f Replace custom debug output functions by av_dlog(). 2011-06-03 00:44:03 +02:00
Diego Biurrun
752207e36b cook: Remove unused debug functions. 2011-06-03 00:43:56 +02:00
Stefano Sabatini
e977ca2645 lavfi: add avfilter_link_free() function 
Allow to free the buffers cached in each AVFilterLink pool.
Fix leak.
 2011-06-03 00:41:32 +02:00
Stefano Sabatini
b932eb1be6 swscale: reintroduce sws_format_name() symbol 
Reintroduce the internal symbol which was removed in:

commit e1197b9e17
Author: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date:   Sun May 29 17:57:40 2011 +0200

    swscale: remove sws_format_name()

    Use av_get_pix_fmt_name() instead.

The symbol is used by some external libs (hi libx264!), this gives
time to them to use the recently added av_get_pix_fmt_name() rather
than an internal symbol.
 2011-06-03 00:41:14 +02:00
Diego Biurrun
b751f61106 Remove stray extra arguments from av_dlog() invocations. 2011-06-02 23:11:58 +02:00
Mans Rullgard
551dfdde70 targa: fix big-endian build 2011-06-02 21:18:04 +01:00
Anton Khirnov
fefa67d536 v4l2: remove one forgotten use of AVFormatParameters.pix_fmt. 2011-06-02 21:52:15 +02:00
Anton Khirnov
4078ed2631 vfwcap: add a framerate private option. 2011-06-02 21:52:15 +02:00
Anton Khirnov
c21324eeb6 v4l2: add a framerate private option. 2011-06-02 21:52:15 +02:00
Anton Khirnov
121ef2e26d libdc1394: add a framerate private option. 2011-06-02 21:52:15 +02:00
Anton Khirnov
1556186a62 fbdev: add a framerate private option. 2011-06-02 21:52:12 +02:00
Anton Khirnov
3e3db4d93d bktr: add a framerate private option. 2011-06-02 21:50:17 +02:00
Mans Rullgard
4c1e56ede8 oma: check avio_read() return value 2011-06-02 20:06:18 +01:00
Mans Rullgard
14086341bf nutdec: remove unused variable 2011-06-02 20:06:18 +01:00
Mans Rullgard
e65ab9d94f Remove unused variables 2011-06-02 20:06:00 +01:00
Michael Niedermayer
6713989c23 swscale: dither for planar yuv outputs 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-02 21:03:55 +02:00
Michael Niedermayer
877f76ad33 swscale: Fix use of uninitialized values 
(bug probably introduced from a marge of libav)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-02 21:03:54 +02:00
Michael Niedermayer
5ad38d93e8 cpudetect: add av_force_cpu_flags() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-02 21:03:54 +02:00
Ronald S. Bultje
808d8ff6bb swscale: allocate larger buffer to handle altivec overreads. 
Altivec sws code intentionally overreads buffers for better performance,
so we need to allocate larger buffers to handle that.
 2011-06-02 11:25:56 -07:00
Alexander Strange
6a9c859444 H264/MPEG frame-level multi-threading. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-06-02 10:16:20 -07:00
Stefano Sabatini
9e66b64c36 vsrc_buffer: propagate error code in av_vsrc_buffer_add_frame() 
Propagate av_vsrc_buffer_add_video_buffer_ref() error code rather than
return 0.
 2011-06-02 18:48:28 +02:00
Stefano Sabatini
665e608c8d lavfi: reindent after the previous commit 2011-06-02 18:48:25 +02:00
Stefano Sabatini
6f1dd6f45a lavfi: add braces around the block of an if() expression in avfilter_default_get_video_buffer 
Clarify code layout.
 2011-06-02 18:47:48 +02:00
Stefano Sabatini
0ff5cbedd2 lavfi: clarify the context of a comment in avfilter_default_get_video_buffer() 
The comment is meant to be about the align parameter.
 2011-06-02 18:24:50 +02:00
Stefano Sabatini
77b32b73ed lavfi: apply misc style fixes 
Adopt K&R style for overall consistency/readability.
 2011-06-02 18:24:49 +02:00
Loren Merritt
53be7b23e9 Cosmetic changes to h264_idct_10bit.asm. 
Removes redundant dword tags and whitespace changes.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-06-02 07:07:15 -07:00
Loren Merritt
994c3550ff 2x faster h264_idct_add8_10. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-06-02 07:07:02 -07:00
Nathan Caldwell
cc9947ffbe aacenc: Add stereo_mode option. 
ms_off is the default, until Mid/Side is no longer buggy.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-06-02 07:04:22 -07:00
Ronald S. Bultje
e6635a9a19 h264: remove CONFIG_GPL from x86 intra prediction code. 
The authors permitted relicensing to LGPL a long time ago (Holger,
Loren and Jason).
 2011-06-02 07:02:46 -07:00