virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
Code Issues Releases Activity
37,820 Commits 37 Branches 400 Tags
Commit Graph

37820 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diego Biurrun
06b320ad78 swscale: K&R formatting cosmetics for SPARC code 2012-02-07 19:49:49 +01:00
Carl Eugen Hoyos
bf5c0308f2 Fix libutvideo compilation. 
Fixes ticket #985.
 2012-02-07 18:28:00 +01:00
Justin Ruggles
37390d5cca apedec: allow the user to set the maximum number of output samples per call 
It makes sense in some cases to split up the output packet to save on memory
usage (ape frames can be very large), but the current/default size is
arbitrary. Allowing the user to configure this gives more flexibility and
requires minimal additional code.
 2012-02-07 10:01:15 -05:00
Justin Ruggles
39575eead2 apedec: do not unnecessarily zero output samples for mono frames 2012-02-07 10:01:15 -05:00
Justin Ruggles
1d3c672d27 apedec: allocate a single flat buffer for decoded samples 
This will allow the decoder to return samples for the full packet, and it also
makes the decoded buffer pointers aligned.
 2012-02-07 10:01:14 -05:00
Justin Ruggles
32c61400c0 apedec: use sizeof(field) instead of sizeof(type) 2012-02-07 10:01:14 -05:00
Stefano Sabatini
0349d61eef lavfi/aspect: rename field aspect->aspect to aspect->ratio 
The new name is more sensible.
 2012-02-07 15:49:01 +01:00
Stefano Sabatini
d21b82fd3a lavc: provide aliases to the PCM A-law/mu-law codecs 
They are also known as G.711 codecs.
 2012-02-07 15:48:33 +01:00
Ronald S. Bultje
2144941069 swscale: split C output functions into separate file. 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-02-07 12:03:51 +01:00
Ronald S. Bultje
2dd7a1c030 swscale: Split C input functions into separate file. 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-02-07 12:03:50 +01:00
Paul B Mahol
0b717e24f9 ffserver: use avcodec_get_context_defaults3() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-07 05:51:31 +01:00
Michael Niedermayer
b479e01612 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Revert "v210enc: use FFALIGN()"
  doxygen: Do not include license boilerplates in Doxygen comment blocks.
  avplay: reset decoder flush state when seeking
  ape: skip packets with invalid size
  ape: calculate final packet size instead of guessing
  ape: stop reading after the last frame has been read
  ape: return AVERROR_EOF instead of AVERROR(EIO) when demuxing is finished
  ape: return error if seeking to the current packet fails in ape_read_packet()
  avcodec: Clarify AVFrame member documentation.
  v210dec: check for coded_frame allocation failure
  v210enc: use stride as it is already calculated
  v210enc: use FFALIGN()
  v210enc: return proper AVERROR codes instead of -1
  v210enc: do not set coded_frame->key_frame
  v210enc: check for coded_frame allocation failure
  drawtext: add 'fix_bounds' option on coords fixing
  drawtext: fix text_{w, h} expression vars
  drawtext: add missing braces around an if() block.

Conflicts:
	libavcodec/arm/vp8.h
	libavcodec/arm/vp8dsp_init_arm.c
	libavcodec/v210dec.c
	libavfilter/vf_drawtext.c
	libavformat/ape.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-07 01:40:29 +01:00
Aneesh Dogra
db7d45237a bytestream: Add bytestream2 writing API. 
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-06 18:56:13 -05:00
Paul B Mahol
6ba2505a0e utvideo: remove ff_thread_finish_setup, it isn't needed at all 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-07 00:46:01 +01:00
Reimar Döffinger
787528b4a6 Detect theora keyframes by content in Ogg demuxer. 
A lot of files do not mark keyframes correctly via
granule, so detect keyframe or not based on data
and complain if it mismatches.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-02-06 22:08:45 +01:00
Paul B Mahol
6833fe4342 ffv1: PIX_FMT_GRAY16 support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-06 21:03:24 +01:00
Javier Cabezas
d4385299d3 DNxHD: remove ff_thread_finish_setup, it isn't needed at all. 
Should fix issue #938

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-06 20:59:59 +01:00
Stefano Sabatini
f491f033f5 ffmpeg: document the unit for the -fs option parameter 2012-02-06 20:47:09 +01:00
Stefano Sabatini
b7d45d0b0f lavfi: add setfield filter 2012-02-06 20:46:58 +01:00
Stefano Sabatini
e8a06b1486 lavf/4xm: use proper error codes 2012-02-06 20:33:06 +01:00
Paul B Mahol
d016d3074c Revert "v210enc: use FFALIGN()" 
FFALIGN doesn't work with non-powers-of-2.

This reverts commit 7ad1b612c8a2a1b1b47f6c3c580ced4bca17e1c7.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-02-06 19:57:52 +01:00
Diego Biurrun
32f3c541bc doxygen: Do not include license boilerplates in Doxygen comment blocks. 2012-02-06 19:39:24 +01:00
Justin Ruggles
ec1f3cab20 avplay: reset decoder flush state when seeking 
Fixes seeking after decoder has already been flushed for codecs using
CODEC_CAP_DELAY.
 2012-02-06 13:22:01 -05:00
Justin Ruggles
f1c3d4a68a ape: skip packets with invalid size 2012-02-06 13:22:01 -05:00
Justin Ruggles
ac3f8d317c ape: calculate final packet size instead of guessing 
Calculates based on total file size and wavetaillength from the header.
Falls back to multiplying finalframeblocks by 8 instead of 4 so that it will
at least be overestimating for 24-bit. Currently it can underestimate the
final packet size, leading to decoding errors.
 2012-02-06 13:22:01 -05:00
Justin Ruggles
c2c316158f ape: stop reading after the last frame has been read 
This avoids buffer overread when the last packet size estimate is too small.
 2012-02-06 13:09:11 -05:00
Justin Ruggles
66f7be3603 ape: return AVERROR_EOF instead of AVERROR(EIO) when demuxing is finished 2012-02-06 13:09:11 -05:00
Justin Ruggles
1bc035bc03 ape: return error if seeking to the current packet fails in ape_read_packet() 2012-02-06 13:09:11 -05:00
Kieran Kunhya
9814974d2e avcodec: Clarify AVFrame member documentation. 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-02-06 18:08:08 +01:00
Stefano Sabatini
2cbe9121ac doc/filters.texi: use multiple @example blocks for distinct examples in setdar docs 2012-02-06 11:30:54 +01:00
Stefano Sabatini
23534d0c4c doc/filters.texi: prefer @example over the unsupported @math for showing equation 2012-02-06 11:30:54 +01:00
Stefano Sabatini
3fa9ace3d8 doc/filters.texi: merge setdar and setsar documentation 
Most of the documentation is common to both filters, and I'm going to add
more shared docs. Factorize.
 2012-02-06 11:30:54 +01:00
Stefano Sabatini
70ffda3217 lavu: introduce av_parse_ratio() and use it in ffmpeg and lavfi/aspect 
Factorize code and provide ratio parsing consistency.
 2012-02-06 11:30:54 +01:00
Stefano Sabatini
1ca0812d90 ffprobe: fix typo in ESCAPE_CHECK_SIZE 2012-02-06 11:30:45 +01:00
Paul B Mahol
3cc0353f8d v210dec: check for coded_frame allocation failure 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-02-06 08:00:31 +01:00
Paul B Mahol
986c1c483b v210enc: use stride as it is already calculated 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-02-06 08:00:23 +01:00
Paul B Mahol
7ad1b612c8 v210enc: use FFALIGN() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-02-06 08:00:15 +01:00
Paul B Mahol
b5f50da593 v210enc: return proper AVERROR codes instead of -1 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-02-06 07:59:47 +01:00
Paul B Mahol
66fa2a1fb3 v210enc: do not set coded_frame->key_frame 
It is already set in avcodec_alloc_frame().

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-02-06 07:59:24 +01:00
Paul B Mahol
d73466f841 v210enc: check for coded_frame allocation failure 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-02-06 07:59:16 +01:00
Andrey Utkin
e496c45d9b drawtext: add 'fix_bounds' option on coords fixing 
Before, drawtext filter deliberately altered given text coordinates if
text didn't fully fit on the picture. This breaks the use case of
scrolling large text, e.g. movie closing credits.
Add 'fix_bounds', to make it usable in such cases (by setting its value to 0).
Default behavior is not changed, and non-fitting text coords are fixed.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-02-06 07:57:40 +01:00
Andrey Utkin
2b43dfce36 drawtext: fix text_{w, h} expression vars 
Before, {text_,}{w,h} vars hadn't got initialized

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-02-06 07:52:05 +01:00
Michael Niedermayer
e81e0b9991 cache: fix "warning: passing argument 2 of ‘av_tempfile’ from incompatible pointer type" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-06 02:04:09 +01:00
Michael Niedermayer
8d756c0d55 fix "warning: variable ‘cflags’ set but not used" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-06 02:04:09 +01:00
Michael Niedermayer
6679271700 avio: Fix "warning: initialization from incompatible pointer type" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-06 02:04:08 +01:00
Paul B Mahol
ef511d8a35 changelog: fix typo 2012-02-06 00:31:12 +01:00
Paul B Mahol
b8d78175d2 v408: do not unconditionally compile codecs 2012-02-06 00:29:32 +01:00
Carl Eugen Hoyos
bb9c8d9439 Add v408 / AYUV encoder and decoder. 
Fixes last part of ticket #470.

Reviewed-by: Paul B Mahol
 2012-02-05 20:43:33 +01:00
Carl Eugen Hoyos
5fa1a1d8fc Support YV12 from video4linux2 devices. 
Reviewed-by: Luca Abeni
 2012-02-05 20:06:12 +01:00
Carl Eugen Hoyos
42ae83c196 Allow muxing VP6A into flv. 
Reviewed-by: James Zern
 2012-02-05 17:42:26 +01:00