generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
32,106 Commits 24 Branches 241 Tags
Commit Graph

63 Commits

Author SHA1 Message Date
Michael Niedermayer
3f1a58db6f Merge commit 'b143844ea0f6246e0d5a938d743e2e8a98453bec' into release/0.8 
* commit 'b143844ea0f6246e0d5a938d743e2e8a98453bec': (22 commits)
  aacdec: Fix an off-by-one overwrite when switching to LTP profile from MAIN.
  vp6: properly fail on unsupported feature
  h264: Fix parameters to ff_er_add_slice() call
  flacenc: ensure the order is within the min/max range in LPC order search
  yuv4mpeg: reject unsupported codecs
  vp8: reset loopfilter delta values at keyframes.
  vp56: release frames on error
  vp56: make parse_header return standard error codes
  ivi_common: check that scan pattern is set before using it.
  Update RELEASE file for 0.7.7
  tiffenc: Check av_malloc() results.
  mpegaudiodec: fix short_start calculation
  h264: avoid stuck buffer pointer in decode_nal_units
  yuv4mpeg: return proper error codes.
  smacker audio: sign-extend the initial 16-bit predicted value
  vf_pad: don't give up its own reference to the output buffer.
  avidec: return 0, not packet size from read_packet().
  wmapro: prevent division by zero when sample rate is unspecified
  alsdec: fix number of decoded samples in first sub-block in BGMC mode.
  alsdec: remove dead assignments
  ...

Conflicts:
	RELEASE
	libavformat/avidec.c
	libavformat/yuv4mpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-17 03:03:39 +01:00
Luca Barbato
f3f22f183f yuv4mpeg: reject unsupported codecs 
The muxer already rejects unsupported pixel formats, reject also
unsupported codecs to prevent dangerous misuses.
(cherry picked from commit 424b1e764263b1493de4c34365ef367ddae856db)

Conflicts:

	libavformat/yuv4mpeg.c

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2013-01-12 19:20:27 +01:00
Anton Khirnov
5754176b5b yuv4mpeg: return proper error codes. 
Fixes Bug 373.

CC:libav-stable@libav.org
(cherry picked from commit d3a72becc6371563185a509b94f5daf32ddbb485)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2013-01-04 07:43:38 +01:00
Mans Rullgard
e65ab9d94f Remove unused variables 2011-06-02 20:06:00 +01: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
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
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Anton Khirnov
b7f2fdde74 avio: rename put_flush_packet -> avio_flush 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 22:59:39 -04:00
Anton Khirnov
77eb5504d3 avio: avio: avio_ prefixes for put_* functions 
In the name of consistency:
put_byte           -> avio_w8
put_<type>         -> avio_w<type>
put_buffer         -> avio_write

put_nbyte will be made private
put_tag will be merged with avio_put_str

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-21 14:25:15 -05:00
Anton Khirnov
b7effd4e83 avio: avio_ prefixes for get_* functions 
In the name of consistency:
get_byte           -> avio_r8
get_<type>         -> avio_r<type>
get_buffer         -> avio_read

get_partial_buffer will be made private later

get_strz is left out becase I want to change it later to return
something useful.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-21 11:23:22 -05:00
Anton Khirnov
ae628ec1fd avio: rename ByteIOContext to AVIOContext. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-20 08:37:15 -05:00
Diego Elio Pettenò
c6610a216e Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice. 
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
 2011-01-26 22:10:09 +00:00
Daniel Kang
7f8ffc4efd Fix a floating point exception for invalid framerate, fixes issue 2470. 
Patch by Daniel Kang, daniel.d.kang at gmail

Originally committed as revision 26188 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-02 05:01:46 +00:00
Stefano Sabatini
72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which 
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-30 23:30:55 +00:00
David Conrad
56bb72dc3b Use chroma_sample_location in reading/writing yuv4mpeg 
Originally committed as revision 18796 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-11 04:35:15 +00:00
Diego Biurrun
406792e7b0 cosmetics: Remove pointless period after copyright statement non-sentences. 
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-19 15:46:40 +00:00
Aurelien Jacobs
b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*. 
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 23:44:16 +00:00
Aurelien Jacobs
5972945197 convert every muxer/demuxer to write/read sample_aspect_ratio from/to 
the corresponding AVStream instead of AVCodecContext

Originally committed as revision 14933 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-23 23:43:20 +00:00
Diego Biurrun
66b32ce8d0 Move functions only used for muxing below #ifdef CONFIG_YUV4MPEGPIPE_MUXER, 
fixes some warnings when compiling with muxers disabled.

Originally committed as revision 14162 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-11 07:37:22 +00:00
Baptiste Coudurier
2562ccb38d remove useless close func 
Originally committed as revision 13834 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-19 22:58:13 +00:00
Stefano Sabatini
bde15e74de Make long_names in lavf/lavdev optional depending on CONFIG_SMALL. 
patch by Stefano Sabatini, stefano.sabatini-lala poste.it
along with some spelling/consistency fixes for the long names by me

Originally committed as revision 13649 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-03 16:20:54 +00:00
Michael Niedermayer
8b9c4ad237 ENOMEM is better, yes ... 
Originally committed as revision 13535 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-29 15:40:16 +00:00
Michael Niedermayer
884d53855d Null pointer check / CID26. 
Originally committed as revision 13488 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-28 01:57:19 +00:00
Michael Niedermayer
7a7718e38f useless 
Originally committed as revision 13486 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-28 01:53:23 +00:00
Björn Axelsson
899681cd1d Use dynamically allocated ByteIOContext in AVFormatContext 
patch by: Björn Axelsson, bjorn d axelsson a intinor d se
thread: [PATCH] Remove static ByteIOContexts, 06 nov 2007

Originally committed as revision 11071 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-21 07:41:00 +00:00
Panagiotis Issaris
6f3e0b2174 Replace all occurrences of AVERROR_IO with AVERROR(EIO). 
Originally committed as revision 9760 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-19 15:23:32 +00:00
Vitor Sessak
7cf0999529 remove empty write trailer functions 
patch by Vitor: [vitor1001 gmail com]

Originally committed as revision 9442 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-27 06:54:47 +00:00
Michael Niedermayer
87e8788680 allocate 32 extra bytes at the end of the probe buffer and remove most probe buf_size checks 
Originally committed as revision 8677 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-08 11:34:15 +00:00
Diego Biurrun
b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library' 
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-07 15:30:46 +00:00
Måns Rullgård
ff70e60176 allow individual selection of muxers and demuxers 
Originally committed as revision 5707 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-10 21:14:37 +00:00
Måns Rullgård
d2a067d1d9 give AVInput/OutputFormat structs consistent names 
Originally committed as revision 5697 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-09 23:40:53 +00:00
Stefan Huehner
a97c1e93aa Add (mostly) const to variable and parameter declaration, where a char* was 
used and 'const char*' should be, plus make some function declarations
static if they aren't used outside their declaring source file.
patch by Stefan Huehner stefan%%at%%huehner%%dot%%org

Originally committed as revision 5492 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-06-17 15:53:23 +00:00
Colin Ward
72fbc5092a Move CONIG_MUXERS below struct frame_attributes, it's not muxer-specific. 
patch by Colin Ward, hitman*at*codehq*dot*org

Originally committed as revision 4962 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-02-08 15:39:12 +00:00
Luca Abeni
ad97e414e2 Correctly set the interlaced_frame and top_field_first fields. 
patch by Luca Abeni, lucabe72 =at= email =dot= it

Originally committed as revision 4961 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-02-08 11:54:05 +00:00
Diego Biurrun
5509bffa88 Update licensing information: The FSF changed postal address. 
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-12 22:43:26 +00:00
Diego Biurrun
bb270c0896 COSMETICS: tabs --> spaces, some prettyprinting 
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-22 01:10:11 +00:00
Diego Biurrun
115329f160 COSMETICS: Remove all trailing whitespace. 
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-17 18:14:38 +00:00
Diego Biurrun
a9e3509529 Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS 
in libavformat to allow building (de)coders and (de)muxers independently at
some point + support for this option in configure.

Originally committed as revision 4611 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-09-23 00:25:41 +00:00
Måns Rullgård
bf4e3bd2d0 kill a bunch of compiler warnings 
Originally committed as revision 4522 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-08-14 15:42:40 +00:00
Michael Niedermayer
01f4895c68 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility 
Originally committed as revision 4453 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-07-17 22:24:36 +00:00
Michael Niedermayer
2692067a45 AVPacket.pos 
Originally committed as revision 4314 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-26 20:17:12 +00:00
Michael Niedermayer
c0df9d75bd switch to native time bases 
Originally committed as revision 4168 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-04-30 21:43:59 +00:00
Roine Gustafsson
8cf71eadd2 Adds read probe to y4m, and changes the extension to .y4m patch by (Roine Gustafsson <roine users sourceforge net) 
Originally committed as revision 4164 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-04-26 09:06:39 +00:00
Roine Gustafsson
93b2b333b9 Update yuv4mpeg to use PIX_FMT_NONE patch by (Roine Gustafsson <roine users sourceforge net) 
Originally committed as revision 4163 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-04-26 08:57:41 +00:00
Roine Gustafsson
f96b17c5d6 add luma only support to yuv4mpeg patch by (Roine Gustafsson <roine users.sourceforge net>) 
Originally committed as revision 3846 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-19 12:27:48 +00:00
Roine Gustafsson
2d74541476 - Writes correct unknown aspect 
- Adds read and write support for yuv422p and yuv444p
- New parser will read all well-formed YUV4MPEG2 stream headers
patch by (Roine Gustafsson <roine users.sourceforge net>)

Originally committed as revision 3800 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-04 01:55:50 +00:00
Michael Niedermayer
71c32f19b3 do not call (av_)abort() 
Originally committed as revision 3544 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-01 13:16:16 +00:00
Mike Melanson
0bd586c50d sweeping change from -EIO -> AVERROR_IO 
Originally committed as revision 3239 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-19 03:59:34 +00:00
Michael Niedermayer
e928649b0b pass AVPacket into av_write_frame() 
fixes the random dts/pts during encoding
asf preroll fix
no more initial zero frames for b frame encoding
mpeg-es dts during demuxing fixed
.ffm timestamp scale fixed, ffm is still broken though

Originally committed as revision 3168 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-29 02:06:32 +00:00
Steven M. Schultz
d298185c73 yuv4mpeg output 'C' tag patch by ("Steven M. Schultz" <sms at 2bsd dot com>) 
Originally committed as revision 2944 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-01 23:32:53 +00:00