1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Commit Graph

15 Commits

Author SHA1 Message Date
Michael Niedermayer
b3ab337227 audiointerleave: check timebase
Replaces FPE by clean error

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-01 21:21:13 +02:00
Carl Eugen Hoyos
4d7c71c364 Check for OOM after av_mallocz() in ff_interleave_add_packet().
Fixes a crash with the sample from Ubuntu bug #869125.
2011-11-08 10:35:14 +01:00
Michael Niedermayer
976a8b2179 Merge remote-tracking branch 'qatar/master'
* qatar/master: (40 commits)
  H.264: template left MB handling
  H.264: faster fill_decode_caches
  H.264: faster write_back_*
  H.264: faster fill_filter_caches
  H.264: make filter_mb_fast support the case of unavailable top mb
  Do not include log.h in avutil.h
  Do not include pixfmt.h in avutil.h
  Do not include rational.h in avutil.h
  Do not include mathematics.h in avutil.h
  Do not include intfloat_readwrite.h in avutil.h
  Remove return statements following infinite loops without break
  RTSP: Doxygen comment cleanup
  doxygen: Escape '\' in Doxygen documentation.
  md5: cosmetics
  md5: use AV_WL32 to write result
  md5: add fate test
  md5: include correct headers
  md5: fix test program
  doxygen: Drop array size declarations from Doxygen parameter names.
  doxygen: Fix parameter names to match the function prototypes.
  ...

Conflicts:
	libavcodec/x86/dsputil_mmx.c
	libavformat/flvenc.c
	libavformat/oggenc.c
	libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-04 00:45:21 +02:00
Mans Rullgard
0ebcdf5cda Do not include mathematics.h in avutil.h
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-03 21:42:06 +01: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
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
Reimar Döffinger
3898eed890 Reorder arguments for av_fifo_generic_read to be more logical and
consistent with av_fifo_generic_write.

Originally committed as revision 17914 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 17:47:47 +00:00
Reimar Döffinger
c957c85426 Replace all uses of the replaced av_fifo_read by av_fifo_generic_read
Originally committed as revision 17873 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-08 14:42:11 +00:00
Michael Niedermayer
41dd680dd8 Allocate AVFifoBuffer through the fifo API to reduce future API/ABI issues.
Yes this breaks ABI/API but ive already broken it and will bump avutil major
soon.

Originally committed as revision 17869 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-08 14:16:55 +00:00
Baptiste Coudurier
50ced76f4b check fifo size and realloc if needed
Originally committed as revision 17420 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-18 04:42:31 +00:00
Baptiste Coudurier
16e3b0b3e6 rename ff_audio_interleave to ff_audio_rechunk_interleave
Originally committed as revision 17103 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-09 21:34:20 +00:00
Baptiste Coudurier
1cc65cecb2 Move declaration of ff_interleave_add_packet to internal.h.
It is an internal function and should not be in an installed header.

Originally committed as revision 17070 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 21:14:46 +00:00
Baptiste Coudurier
18099ade6f Declare ff_interleave_new_audio_packet as static, it is not used
outside of audiointerleave.c.  Also remove the function declaration
  from the header as it is now static.

Originally committed as revision 17068 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 21:09:50 +00:00
Baptiste Coudurier
9e8d61d4f1 rewrite pts also, as comment says
Originally committed as revision 17051 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 09:48:59 +00:00
Baptiste Coudurier
f1544e79f2 extract audio interleaving code from mxf muxer, will be used by gxf and dv
Originally committed as revision 17038 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 04:31:44 +00:00