RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
30,445 Commits 36 Branches 392 Tags 310 MiB
Commit Graph

30445 Commits

Author SHA1 Message Date
Stefano Sabatini eb5a3ab7b0 swscale: fix compilation of bfin due to missing pixdesc.h header 
This is required after sws_format_name() was replaced by
av_get_pix_fmt(), which is declared in libavutil/pixdesc.h.
 2011-06-01 13:30:35 +02:00
Stefano Sabatini adf9415598 lavf: tag dump_format() as @deprecated 
This makes the generated Doxygen doc link to the replacement
av_dump_format() function.
 2011-06-01 13:07:57 +02:00
Stefano Sabatini 1f95fb5813 yuv4mpeg: complain and exit if a non-rawvideo stream is selected 
The yuv4mpeg muxer will crash otherwise.
 2011-06-01 13:05:05 +02:00
Stefano Sabatini ac41f3b036 ffmpeg: handle copy of packets for AVFMT_RAWPICTURE output formats 
Store AVPicture in AVPacket as required by AVFMT_RAWPICTURE formats.

Fix trac issue #251.
 2011-06-01 13:04:53 +02:00
Stefano Sabatini ca858ab77d doc/examples: give meaningful names to the example files 
Rename:
api-example.c    -> encoding-example.c
output-example.c -> muxing-example.c
 2011-06-01 13:02:08 +02:00
Michael Niedermayer 201549d1a9 swscale: More accurate rounding in YSCALE_YUV_2_PACKEDX_FULL_C() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-01 05:01:22 +02:00
Michael Niedermayer f6a8ce98a7 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  vf_drawtext: Replace FFmpeg by Libav in license boilerplate.
  mpegaudiodec: remove unusued code and variables
  improved 'edts' atom writing support
  mpegaudio: clean up compute_antialias() definition
  vp8: fix segmentation race during frame-threading.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-01 00:09:05 +02:00
James Zern 0abbd3adb6 doc: add libvpx encoder section 
Documents the mapping from FFmpeg options to libvpx.
 2011-05-31 22:58:31 +02:00
Diego Biurrun 5ac4952a58 vf_drawtext: Replace FFmpeg by Libav in license boilerplate. 2011-05-31 21:15:49 +02:00
Mans Rullgard fdf18e33bb mpegaudiodec: remove unusued code and variables 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-31 18:52:02 +01:00
Piotr Kaczuba 84fb4e9df7 postprocess.c: filter name needs to be double 0 terminated 2011-05-31 17:50:46 +02:00
Gil Pedersen c16919487e improved 'edts' atom writing support 
The 'edts' write function can now generate an initial empty edit resulting in a track-specific presentation delay.
This is automatically calculated and inserted for any track where the initial DTS != 0.
Added support for long (version==1) timecodes.
 2011-05-31 08:16:18 -07:00
Mans Rullgard 6f1ec38ce2 mpegaudio: clean up compute_antialias() definition 
This merges the float and fixed-point versions of the compute_antialias
function, fixes invalid array indexing, and eliminates a dead copy of
csa_table.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-31 15:30:21 +01:00
Ronald S. Bultje 9ebcf7699b vp8: fix segmentation race during frame-threading. 
Fixes occasional failure of make fate-vp8-test-vector-010 with
frame-multithreading enabled.
 2011-05-31 07:13:34 -07:00
Reimar Döffinger a52f598d63 Port libmpcodec fixes from MPlayer. 2011-05-31 07:40:20 +02:00
Alexander Strange a54dceb26a Merge remote-tracking branch 'ffmpeg-mt/master' 
* ffmpeg-mt/master:
      Update todo
      The maximum buffer size needs to be 33, not 32

    merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-31 03:10:35 +02:00
Michael Niedermayer 40c29d42cf Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  swscale: Remove unused variable.
  ARM: simplify inline asm with 64-bit operands

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-31 02:08:20 +02:00
Diego Biurrun f635a233e3 swscale: Remove unused variable. 2011-05-30 23:19:06 +02:00
Mans Rullgard 6bb70dfd74 ARM: simplify inline asm with 64-bit operands 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-30 21:19:57 +01:00
Reimar Döffinger 3d0424f2ff Add "const" to avoid "initialization discards qualifiers" warning. 2011-05-30 20:07:39 +02:00
Reimar Döffinger 70564983c5 Add const to fix "cast discards qualifiers" warnings. 2011-05-30 20:02:39 +02:00
Reimar Döffinger b7b62c3a53 Include pixdesc.h for av_get_pix_fmt_name. 
Fixes compilation on PPC with Altivec enabled.
 2011-05-30 19:35:32 +02:00
Tomas Härdin f86d260df3 wav: Don't avio_seek() if we know we'll run into EOF 
Since we want to break the loop the 'if (data_ofs < 0)' block is moved after the loop.
This fixes ticket #250.
 2011-05-30 15:44:23 +02:00
Stefano Sabatini c328122a8d api-example: uppercase first letter in "copyright" 
Improve consistency.
 2011-05-30 09:41:51 +02:00
Stefano Sabatini f501c74d99 output-example: create @file doxy from text in the copyright header 2011-05-30 09:20:06 +02:00
Stefano Sabatini 9362b50941 examples: move API examples to a dedicated dir in doc 2011-05-30 09:20:06 +02:00
Stefano Sabatini f712f6c8a4 ffmpeg: simplify opt_*_codec() options 
Replace opt_{audio,video,subtitle,data}_codec() with a single
opt_codec() function.
 2011-05-30 09:09:56 +02:00
Stefano Sabatini 7533a727f9 v4l2: rewrite code iterating the supported standards 
Simplify/clarify the code logic and error reporting.
 2011-05-30 09:08:42 +02:00
Stefano Sabatini 2d48515eb7 v4l2: perform minor style fixes 2011-05-30 09:08:42 +02:00
Stefano Sabatini 7b017086d4 v4l2: replace memset() with explicit struct initialization 2011-05-30 09:08:42 +02:00
Stefano Sabatini 50fee0fc8b rawdec: fail in case of unknow pixel format 2011-05-30 09:07:43 +02:00
Stefano Sabatini e1197b9e17 swscale: remove sws_format_name() 
Use av_get_pix_fmt_name() instead.
 2011-05-30 09:07:43 +02:00
Michael Niedermayer 2c10ee2358 error.c: fix compile flags 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-30 03:11:54 +02:00
Michael Niedermayer 35bed44fc9 TCP: change default timeout to 5sec 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-30 02:39:26 +02:00
Michael Niedermayer a22500744b Revert "Timeout TCP open() after 5 seconds." 
This code is redundant and conflicts with lucas reimplementation of it.

This reverts commit a2f5e14a86.
 2011-05-30 02:36:49 +02:00
Michael Niedermayer 5a35cef4b1 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  ARM: enable UAL syntax in asm.S
  v4l2: don't leak video standard string on error.
  swscale: Remove disabled code.
  avfilter: Surround function only used in debug mode by appropriate #ifdef.
  vf_crop: Replace #ifdef DEBUG + av_log() by av_dlog().
  build: remove BUILD_ROOT variable
  vp8: use av_clip_uintp2() where possible

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-30 01:29:11 +02:00
Clément Bœsch adba9c6352 Fix various unused variable warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-30 00:24:01 +02:00
Clément Bœsch fd38a15adf Fix various bad printf format warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-30 00:03:06 +02:00
Mans Rullgard 371266daa3 ARM: enable UAL syntax in asm.S 
This enables UAL syntax for all asm files instead of only those
which happen to be incompatible with the old, deprecated syntax.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-29 15:42:56 +01:00
Reimar Döffinger bb9b7bc62e Remove now unused nb_istreams variable. 2011-05-29 15:33:48 +02:00
Reimar Döffinger 89c687e97e Add const to vector types for input in altivec code. 
Avoids a large amount of warnings about cast discarding qualifiers.
 2011-05-29 15:25:17 +02:00
Reimar Döffinger 4596d0f4c4 Remove unused variable, avoiding compiler warning. 2011-05-29 15:23:28 +02:00
Reimar Döffinger 54dc95634d Cast pointers to uintptr_t rather than unsigned int. 
Avoids potential warnings on PPC64 systems.
 2011-05-29 15:22:15 +02:00
Anton Khirnov 7a70e01b26 v4l2: don't leak video standard string on error. 2011-05-29 15:10:35 +02:00
Diego Biurrun 06b5facd4b swscale: Remove disabled code. 2011-05-29 14:32:08 +02:00
Diego Biurrun d6e0729b24 avfilter: Surround function only used in debug mode by appropriate #ifdef. 
This fixes the warning:
libavfilter/avfilter.c:219: warning: ‘ff_get_ref_perms_string’ defined but not used
 2011-05-29 13:43:03 +02:00
Diego Biurrun 2146f4928a vf_crop: Replace #ifdef DEBUG + av_log() by av_dlog(). 2011-05-29 13:43:02 +02:00
Mans Rullgard 798b264678 build: remove BUILD_ROOT variable 
This variable is unnecessary as absolute paths are not required.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-29 12:36:16 +01:00
Michael Niedermayer b8a43bc1b5 Merge remote-tracking branch 'qatar/master' into master 
* qatar/master: (27 commits)
  ac3enc: fix LOCAL_ALIGNED usage in count_mantissa_bits()
  ac3dsp: do not use the ff_* prefix when referencing ff_ac3_bap_bits.
  ac3dsp: fix loop condition in ac3_update_bap_counts_c()
  ARM: unbreak build
  ac3enc: modify mantissa bit counting to keep bap counts for all values of bap instead of just 0 to 4.
  ac3enc: split mantissa bit counting into a separate function.
  ac3enc: store per-block/channel bap pointers by reference block in a 2D array rather than in the AC3Block struct.
  get_bits: add av_unused tag to cache variable
  sws: replace all long with int.
  ARM: aacdec: fix constraints on inline asm
  ARM: remove unnecessary volatile from inline asm
  ARM: add "cc" clobbers to inline asm where needed
  ARM: improve FASTDIV asm
  ac3enc: use LOCAL_ALIGNED macro
  APIchanges: fill in git hash for av_get_pix_fmt_name (0420bd7).
  lavu: add av_get_pix_fmt_name() convenience function
  cmdutils: remove OPT_FUNC2
  swscale: fix crash in bilinear scaling.
  vpxenc: add VP8E_SET_STATIC_THRESHOLD mapping
  webm: support stereo videos in matroska/webm muxer
  ...

Conflicts:
	Changelog
	cmdutils.c
	cmdutils.h
	doc/APIchanges
	doc/muxers.texi
	ffmpeg.c
	ffplay.c
	libavcodec/ac3enc.c
	libavcodec/ac3enc_float.c
	libavcodec/avcodec.h
	libavcodec/get_bits.h
	libavcodec/libvpxenc.c
	libavcodec/version.h
	libavdevice/libdc1394.c
	libavformat/matroskaenc.c
	libavutil/avutil.h
	libswscale/rgb2rgb.c
	libswscale/swscale.c
	libswscale/swscale_template.c
	libswscale/x86/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-29 03:34:35 +02:00
Mans Rullgard 4276112277 vp8: use av_clip_uintp2() where possible 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-29 02:10:05 +01:00