virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Code Issues Releases Activity
90,832 Commits 37 Branches 400 Tags 463 MiB
ded52f6e36
Commit Graph

277 Commits

Author SHA1 Message Date
Diego Biurrun
919d7a345a Replace DEBUG_SEEK/DEBUG_SI + av_log combinations by av_dlog. 2011-06-10 19:12:14 +02:00
Michael Niedermayer
d552f616a2 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (28 commits)
  Remove some non-compiling debug messages.
  ffplay: Fix non-compiling debug printf and replace it by av_dlog.
  H264: x86 predict init cosmetics.
  ac3enc: Fix linking of AC-3 encoder without the E-AC-3 encoder.
  Move E-AC-3 encoder functions to a separate eac3enc.c file.
  ac3enc: remove convenience macro, #define DEBUG
  ac3enc: remove unused #define
  vc1: re-initialize tables after width/height change.
  APIchanges: fill-in git commit hash for av_get_bytes_per_sample() addition
  samplefmt: add av_get_bytes_per_sample()
  iirfilter: fix biquad filter coefficients.
  swscale: remove duplicate conversion routine in swScale().
  swscale: add yuv2planar/packed function typedefs.
  swscale: integrate yuv2nv12X_C into yuv2yuvX() function pointers.
  swscale: reindent x86 init code.
  swscale: extract SWS_FULL_CHR_H_INT conditional into init code.
  swscale: cosmetics.
  swscale: remove alp/chr/lumSrcOffset.
  swscale: un-special-case yuv2yuvX16_c().
  shorten: Remove stray DEBUG #define and corresponding av_dlog statement.
  ...

Conflicts:
	doc/APIchanges
	libavcodec/ac3enc.c
	libavutil/avutil.h
	libavutil/samplefmt.c
	libswscale/swscale.c
	libswscale/swscale_internal.h
	libswscale/x86/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-08 05:25:28 +02:00
Diego Biurrun
ac4a854811 Remove some non-compiling debug messages. 2011-06-08 00:45:47 +02:00
Diego Biurrun
d7cf5639e7 Replace some printf instances in debug code by av_log. 2011-06-07 13:20:57 +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
Diego Biurrun
b751f61106 Remove stray extra arguments from av_dlog() invocations. 2011-06-02 23:11:58 +02:00
Diego Biurrun
045dd4b928 Replace some commented-out debug printf() / av_log() messages with av_dlog(). 2011-04-29 17:27:01 +02:00
Michael Niedermayer
2cae9809e2 Merge remote branch 'qatar/master' 
* qatar/master:
  fate: fix partial run when no samples path is specified
  ARM: NEON fixed-point forward MDCT
  ARM: NEON fixed-point FFT
  lavf: bump minor version and add an APIChanges entry for avio changes
  avio: simplify url_open_dyn_buf_internal by using avio_alloc_context()
  avio: make url_fdopen internal.
  avio: make url_open_dyn_packet_buf internal.
  avio: avio_ prefix for url_close_dyn_buf
  avio: avio_ prefix for url_open_dyn_buf
  avio: introduce an AVIOContext.seekable field
  ac3enc: use generic fixed-point mdct
  lavfi: add fade filter
  Change yadif to not use out of picture lines.
  lavc: deprecate AVCodecContext.antialias_algo
  lavc: mark mb_qmin/mb_qmax for removal on next major bump.

Conflicts:
	doc/filters.texi
	libavcodec/ac3enc_fixed.h
	libavcodec/ac3enc_float.h
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavfilter/vf_fade.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-04 02:15:12 +02:00
Anton Khirnov
8978fedaee avio: introduce an AVIOContext.seekable field 
Use it instead of url_is_streamed and AVIOContext.is_streamed.
 2011-04-03 22:46:40 +02:00
Michael Niedermayer
2f9815dd26 fixed issue1962 EVO detection 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-03 16:40:12 +02:00
Michael Niedermayer
5b56ad03fa Reimplement stream probe try #2 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-03 16:40:11 +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
Michael Niedermayer
0fecf2642b Merge remote-tracking branch 'newdev/master' 
Conflicts:
	Changelog
	doc/APIchanges
	doc/optimization.txt
	libavformat/avio.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-17 17:22:52 +01:00
Anton Khirnov
45a8a02a41 lavf: replace avio_seek(SEEK_CUR) with avio_skip where it makes sense 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 22:24:51 -04:00
Anton Khirnov
66e5b1df36 avio: deprecate url_feof 
AVIOContext.eof_reached should be used directly instead.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 17:20:31 -05:00
Anton Khirnov
384c9c2fa7 avio: add avio_tell macro as a replacement for url_ftell 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit a2704c9712)
 2011-03-05 02:29:31 +01:00
Anton Khirnov
a2704c9712 avio: add avio_tell macro as a replacement for url_ftell 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-04 11:26:57 -05:00
Anton Khirnov
74b3f67c9c lavf: replace all uses of url_fskip with avio_seek 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e356fc57a2)
 2011-03-03 14:15:08 +01:00
Anton Khirnov
f59d8ff8cd avio: avio_ prefix for url_fseek 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 6b4aa5dac8)
 2011-03-03 14:15:03 +01:00
Anton Khirnov
e356fc57a2 lavf: replace all uses of url_fskip with avio_seek 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-01 12:22:16 -05:00
Anton Khirnov
6b4aa5dac8 avio: avio_ prefix for url_fseek 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-01 12:12:33 -05:00
Anton Khirnov
e63a362857 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>
(cherry picked from commit b7effd4e83)
 2011-02-22 02:44:37 +01: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
471fe57e1a avio: rename ByteIOContext to AVIOContext. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ae628ec1fd)
 2011-02-20 19:05:47 +01: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
Anton Khirnov
f81946729e lavf: move internal functions from avformat.h to internal.h 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 19711af5cd)
 2011-02-09 03:31:17 +01:00
Anton Khirnov
19711af5cd lavf: move internal functions from avformat.h to internal.h 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-06 16:35:00 -05:00
Diego Elio Pettenò
66355be3c3 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.
(cherry picked from commit c6610a216e)
 2011-01-28 03:15:34 +01: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
Måns Rullgård
49bd8e4b84 Fix grammar errors in documentation 
Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-30 15:38:06 +00:00
Janne Grunau
612dc0238a Skip pes payload during probing to avoid start code emulation. 
Patch by Janne Grunau, janne-ffmpeg jannau net

Originally committed as revision 23286 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-24 12:32:13 +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
Michael Niedermayer
0332324a48 Dont give up after 100kb of zero bytes but returnd EAGAIN 
fixes issue1729

Originally committed as revision 21738 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-10 14:25:57 +00:00
Michael Niedermayer
c45ebd5461 Set AVPacket.pos in MPEG-PS demuxer. 
Originally committed as revision 21604 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-02 16:47:51 +00:00
Michael Niedermayer
6de5b62790 Also print the number of invalid packets in the debug output. 
Originally committed as revision 20763 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-08 12:24:41 +00:00
Michael Niedermayer
55f6524789 Flip the comparission direction of vid+audio+priv1 and pspack, it appears to have 
been wrong.
Fixes issue1571.

Originally committed as revision 20762 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-08 12:19:30 +00:00
tralph11@yahoo.com
711e69a730 Improve sofdec dectection to avoid false positives for MP2. 
Patch by tralph11, tralph11 yahoo

Originally committed as revision 20333 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-20 15:27:05 +00:00
Michael Niedermayer
c4674a479b Make mpeg_probe() pass probetest. 
Originally committed as revision 19854 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-15 12:20:03 +00:00
Reimar Döffinger
3489e150d9 Slightly stricter MPEG-PES probing, fixes issue 1383. 
Originally committed as revision 19852 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-15 10:01:25 +00:00
Michael Niedermayer
e8c9383914 Remove 2 ++ from check_pes() that are useless, found by CSA. 
Originally committed as revision 18577 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 18:08:39 +00:00
Ramiro Polla
9ba4821d93 Split TrueHD decoder from MLP 
Originally committed as revision 18045 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-19 21:23:39 +00:00
Diego Biurrun
1aeb55a1de Mark dvdaudio_substream_type variable as av_uninit to work around false 
positive uninitialized variable warning.

Originally committed as revision 17825 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-05 19:13:12 +00:00
Benoit Fouet
80e58c6153 Allow demuxing of audio substreams stored as 0x06 type. 
Fixes issue 725: MPEG2 PS with PCM audio.
On behalf of Jai.

Originally committed as revision 17150 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-11 11:09:36 +00:00
Alex Converse
d84d6fbf28 Increase the number of packets required to identify as MPEG PES to keep from 
identifying MP3 files with padding or garbage at the beginning.

Originally committed as revision 17091 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-09 01:46:01 +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
Diego Pettenò
fb65d2ca84 Use enum typers instead of int. 
Patch by Diego 'Flameeyes' Pettenò: flameeyes gmail

Originally committed as revision 15517 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-02 16:03:00 +00:00
Luca Abeni
dd1c8f3e6e Bump Major version, this commit is almost just renaming bits_per_sample to 
bits_per_coded_sample but that cannot be done seperately.
Patch by Luca Abeni
Also reset the minor version and fix the forgotton change to libfaad.
Note: The API/ABI should not be considered stable yet, there still may
be a change done here or there if some developer has some cleanup ideas and
patches!

Originally committed as revision 15262 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-08 14:24:59 +00:00
Michael Niedermayer
274335e76c vertical align 
Originally committed as revision 14972 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-26 01:29:43 +00:00
Michael Niedermayer
ff9c8d7c6f Add flag to mark demuxers that can output discontinuous timestamps. 
(could also be added to muxers if someone wants)

Originally committed as revision 14777 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-15 16:13:05 +00:00
Michael Niedermayer
c1c9046656 Use CODEC_ID_PROBE when the mpeg-ps demuxer does not know exactly which 
video codec is used.
Fixes issue49 Departed Trailer.evo (mpeg ps missdetecting h264 as mpeg2video)

Originally committed as revision 14196 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-12 22:17:13 +00:00
Baptiste Coudurier
9b64a036c0 remove useless close funcs 
Originally committed as revision 13835 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-19 23:25:04 +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
Joakim Plate
5faf168940 Check return of url_fseek in mpeg timestamp reading code. 
Patch by Joakim elupus ecce se

Originally committed as revision 13527 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-29 09:50:17 +00:00
Lars Täuber
4860abb116 support dvd pcm 20/24 bits, patch by Lars Täuber, lars.taeuber gmx net 
Originally committed as revision 13206 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-21 02:26:42 +00:00
Michael Niedermayer
b22d0c04d7 Support invalid mpeg created by vdr 
(http://www.lucke.in-berlin.de/test_streams/last_played_fine_with_r7852_001.vdr).
fixes issue434

Originally committed as revision 13014 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-29 00:12:49 +00:00
Michael Niedermayer
675b8390f6 Ignore flags after pts/dts if there are no bytes left. 
Fixes decoding of vdr-radio.vdr. (issue198)

Originally committed as revision 12310 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-04 01:31:15 +00:00
Michel Bardiaux
6ba90c204c Suppress runaway index on streamed input 
Originally committed as revision 11527 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-14 16:11:08 +00:00
Paul Kelly
3dea63bd7e user specifyable maximum amount of memory to use for the index. 
patch by Paul Kelly  paul stjohnspoint co uk
with some changes by me

Originally committed as revision 11521 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-13 13:33:37 +00:00
Ivo van Poorten
66e9e30239 Move parsing of MPEG-PES timestamp to mpeg.h (as an inline function) so it 
can easily be reused by other demuxers for formats that encapsulate MPEG-PES.

Originally committed as revision 11451 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-07 23:32:57 +00:00
Ivo van Poorten
3d94e3ba93 use one shift less in get_pts() 
Originally committed as revision 11383 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-03 10:02:46 +00:00
Allan Sandfeld Jensen
7dc75e8d43 Revert r6124, the change was just wrong, other formats than MPEG-PS can be 
stored in CDXA as well. And the need for a CDXA specific check is questionable.
Also ive ok-ed that patch instead of mans ...
fixes issue287 (psxstr misdetection as MPEG-PS)

Original commit message:
add support for information in CDXA format
patch by Allan Sandfeld Jensen % kde A carewolf P com %
Original thread:
Date: Aug 18, 2006 6:33 PM
Subject: [Ffmpeg-devel] CDXA in libavformat [patch]

Originally committed as revision 11314 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-25 09:37:49 +00:00
Michael Niedermayer
7e1720dec6 make mpeg-ps probe less happy with random data 
fixes missdetection of O-MP3-5.mp3

Originally committed as revision 11149 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-03 09:37:06 +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
Måns Rullgård
2c18784703 Improve Sofdec file detection 
Originally committed as revision 10967 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-08 21:27:37 +00:00
Aurelien Jacobs
73039e0fb4 fix potential buffer over-read 
Originally committed as revision 10966 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-08 20:53:06 +00:00
Aurelien Jacobs
cc04af3481 fix negative fseek 
Originally committed as revision 10965 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-08 20:50:45 +00:00
Aurelien Jacobs
8cd4ac3d63 correctly set audio codec when demuxing sofdec files 
samples: http://samples.mplayerhq.hu/game-formats/sfd/

Originally committed as revision 10953 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-07 23:56:00 +00:00
Michael Niedermayer
0c904db118 typo 
Originally committed as revision 10910 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-03 14:57:26 +00:00
Michael Niedermayer
c6dcd0d7f0 fix misdetection of mp3could_not_find_codec_parameters.mp3 
Originally committed as revision 10908 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-03 13:48:30 +00:00
Aurelien Jacobs
2009c7fc96 revert part of r10899 which was not intended 
Originally committed as revision 10901 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-01 18:02:03 +00:00
Aurelien Jacobs
6177c7efe1 remove useless initialization to 0 of adx context 
Originally committed as revision 10899 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-01 17:50:05 +00:00
Michael Niedermayer
4cd2508139 fix misdetection of out.ac3 
Originally committed as revision 9930 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-05 02:17:06 +00:00
Michael Niedermayer
3504467f8b //more debug info 
Originally committed as revision 9929 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-05 02:15:46 +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
Baptiste Coudurier
c4f27438ef remove now useless ifdef 
Originally committed as revision 9383 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-21 09:49:20 +00:00
Baptiste Coudurier
2abe5a01c8 split mpeg ps and variants muxer and demuxer, I'll clean more in a few minutes, lpcm freq tab is left static const in mpeg.h for now until we have more code in common 
Originally committed as revision 9382 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-21 09:39:29 +00:00
Diego Biurrun
755bfeabcc misc spelling fixes 
Originally committed as revision 9289 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-12 09:29:25 +00:00
Wolfram Gloger
7af636d44a Fix loop condition so it can be run through more than once. 
patch by Wolfram Gloger, wmglo dent.med.uni-muenchen de
reference: [Ffmpeg-devel] buffer underflow messages from the output_example.c

Originally committed as revision 8860 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-30 09:46:11 +00:00
Wolfram Gloger
268fc08290 more detailed error message for buffer underflow 
patch by Wolfram Gloger, wmglo dent.med.uni-muenchen de

Originally committed as revision 8859 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-30 09:43:29 +00:00
Aurelien Jacobs
57004ff1d7 add an enum for need_parsing 
Originally committed as revision 8742 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-15 13:51:57 +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
François Revol
8fa36ae09d This fixes error handling for BeOS, removing the need for some ifdefs. 
AVERROR_ defines are moved to avcodec.h as they are needed in there as well. Feel free to move that to avutil/common.h.
Bumped up avcodec/format version numbers as though it's binary compatible we will want to rebuild apps as error values changed.
Please from now on use return AVERROR(EFOO) instead of the ugly return -EFOO in your code.
This also removes the need for berrno.h.

Originally committed as revision 7965 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-13 18:26:14 +00:00
Michael Niedermayer
aad512b4ec Revised patch for HD DVD .EVO demuxing by (Ian Caulfield <lowercase name seperated by . place at here gmail place a dot here com>) 
Originally committed as revision 7853 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-06 19:14:16 +00:00
Michael Niedermayer
80036204af simplify 
Originally committed as revision 7567 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-17 12:06:31 +00:00
Michael Niedermayer
b90ba24b9a simplify pts/dts reading 
Originally committed as revision 7565 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-17 10:55:01 +00:00
Michael Niedermayer
75a9fbb9e9 cosmetic 
Originally committed as revision 7563 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-17 10:45:59 +00:00
Michael Niedermayer
7e4709b18f reduce len checks, simplifies code 
there is a very small chance that a stream which is damaged && unseekable && very small packet && damage to the flags && unlucky buffer state could have a valid packet after a damaged packet lost, but i think this is so unlikely that the simplification outweights it
mans if you disagree with any commit to mpeg.c just say so and ill revert it

Originally committed as revision 7562 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-17 10:44:57 +00:00
Michael Niedermayer
e56cfad04b seperate redo (we dont handle this possibly valid packet) from 
error_redo (somethings is definitly wrong) in which case we try to resync from the last startcode

Originally committed as revision 7560 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-17 10:19:10 +00:00
Steve L'Homme
949b1a13bf Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts. 
patch by Steve Lhomme, slhomme divxcorp com

Originally committed as revision 6868 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-01 22:39:58 +00:00
Aurelien Jacobs
7fbde3431a replace coder/decoder file description in libavformat by muxer/demuxer 
Originally committed as revision 6774 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-23 08:57:54 +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
191e8ca752 fix some signedness warnings 
Originally committed as revision 6355 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-27 19:47:39 +00:00
Roman Shaposhnik
f5a478f65d * Moving FifoBuffer out of libavformat/avformat.h and 
libavformat/utils.c into libavutil

Originally committed as revision 6310 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-21 07:31:53 +00:00
Allan Sandfeld Jensen
c5e331155c add support for information in CDXA format 
patch by Allan Sandfeld Jensen % kde A carewolf P com %
Original thread:
Date: Aug 18, 2006 6:33 PM
Subject: [Ffmpeg-devel] CDXA in libavformat [patch]

Originally committed as revision 6124 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-29 12:03:07 +00:00
Michael Niedermayer
a1c69e0b50 fix probing of 02-Penguin.flac 
= a single startcode should not override extension based detection

Originally committed as revision 6025 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-19 08:39:00 +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
Måns Rullgård
83d0731364 attempt to detect Chinese AVS video 
Originally committed as revision 5604 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-03 21:40:01 +00:00
Måns Rullgård
25c533a2c2 detect audio-only program streams and broken files made by VDR 
Originally committed as revision 5546 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-06-29 19:03:53 +00:00
Måns Rullgård
19e0e403f3 detect MPEG PES streams as MPEG PS; the PS demuxer will cope 
Originally committed as revision 5540 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-06-28 21:40:08 +00:00
Måns Rullgård
d8bee8dd1c allow packets with non-zero PES_scrambling_control 
Originally committed as revision 5499 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-06-19 22:20:38 +00:00
Michael Niedermayer
30a43f2d09 add size to AVIndex 
Originally committed as revision 5083 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-03-01 11:29:55 +00:00
Michael Niedermayer
0b2bb3543f mpeg-ps probe 2nd try 
Originally committed as revision 4974 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-02-11 09:27:00 +00:00
Michael Niedermayer
9870a7bdb8 replace probe() by one similar to MPEG-ES 
Originally committed as revision 4964 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-02-08 17:35:44 +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
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
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
Aurelien Jacobs
9ba73f1f40 add support for muxing subtitles in mpeg-ps 
Originally committed as revision 4380 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-06-15 20:50:12 +00:00
Fabrice Bellard
a9c3213f96 DVD subtitle parsing - show mpeg component IDs by default 
Originally committed as revision 4347 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-06-03 14:01:49 +00:00
Joakim Plate
3f2bf07ba7 fix ac3 and dts detection (patch by Joakim Plate <joakim.plate at ecce.se>) 
Originally committed as revision 4285 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-20 13:10:09 +00:00
Måns Rullgård
e3d1cd8ee9 PSM support in MPEG-PS demuxer. 
Based on a patch by Leon Woestenberg <leonw at mailcan dot com>

Originally committed as revision 4093 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-28 17:33:21 +00:00
Michael Niedermayer
f3356e9c9e more fine grained discarding of packets 
Originally committed as revision 4051 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-17 01:25:01 +00:00
Michael Niedermayer
27a5fe5fdf keyframe & non keyframe index fixes 
Originally committed as revision 4034 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-13 00:13:01 +00:00
Måns Rullgård
88730be651 kill warnings patch by (Måns Rullgård <mru inprovide com>) 
Originally committed as revision 3977 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-02-24 19:08:50 +00:00
Chriss
7be806f31b -target dvd minimum vobu length patch by ("Chris" [chris garveycocker com]) 
Originally committed as revision 3953 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-02-09 03:00:50 +00:00
Michael Niedermayer
b9866ebcc7 support discarding uninterresting packets 
Originally committed as revision 3860 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-22 13:36:02 +00:00
Michael Niedermayer
2de7795ad2 common.h -> common.h/bitstream.h 
Originally committed as revision 3778 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-29 18:31:28 +00:00
Chriss
20b02bc628 This patch takes into account that fifo_realloc may adjust fifo.wptr 
patch by ("Chris" chris at garveycocker dot com)

Originally committed as revision 3727 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-05 02:46:00 +00:00
Michael Niedermayer
0d71240921 fifo_realloc() 
Originally committed as revision 3726 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-01 02:28:28 +00:00
Chriss
7e0fda0a4e DVDNav4 patch by ("Chris" <chris at garveycocker d0t com>) 
Originally committed as revision 3706 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-11-23 22:25:12 +00:00
Michael Niedermayer
cbb6e405c0 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>) 
Originally committed as revision 3700 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-11-21 03:37:33 +00:00
Michael Niedermayer
17c88cb0ce user setable preload and max_mux_delay 
Originally committed as revision 3602 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-16 21:27:42 +00:00
Michael Niedermayer
6c55b27f8f do not randomize unknown timestamps 
Originally committed as revision 3568 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-07 01:55:34 +00:00
Michael Niedermayer
2db3c638a7 user selectable packet_size and mux_rate 
Originally committed as revision 3566 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-06 22:29:30 +00:00
Paul Curtis
78a0efb4fc AVOutputFormat mpeg2dvd_mux and int is_dvd from the dvd patch by (Paul Curtis <pfc at terrapin dot com>) 
Originally committed as revision 3557 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-03 18:21:45 +00:00
Michael Niedermayer
e0c91bc23b initial dts fix 
Originally committed as revision 3555 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-03 12:58:14 +00:00
Michael Niedermayer
2031ba1bf2 remove wrong 33bit truncation of internal timestamps 
Originally committed as revision 3554 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-03 12:17:46 +00:00
Michael Niedermayer
bc3429e382 pts/dts 100l fix 
Originally committed as revision 3553 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-03 11:16:40 +00:00
Michael Niedermayer
7e05155850 cleanup video buffer size 
Originally committed as revision 3552 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-03 03:14:09 +00:00
Michael Niedermayer
9205093333 cleanup 
Originally committed as revision 3551 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-03 02:57:42 +00:00
Michael Niedermayer
7000a17542 SCR timestamp fix try #1 
Originally committed as revision 3550 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-03 02:42:01 +00:00
Michael Niedermayer
d8b5abfa70 simplify put_padding_packet() 
Originally committed as revision 3549 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-01 20:05:04 +00:00
Michael Niedermayer
c40a3a42e1 move free() of AVStream priv data to av_write_trailer() 
Originally committed as revision 3548 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-01 16:30:15 +00:00
Michael Niedermayer
95f97de146 64bit and reading over the end of the array fixes 
Originally committed as revision 3547 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-01 16:00:00 +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
Michael Niedermayer
23c9925329 libdts support by (Benjamin Zores <ben at geexbox dot org>) 
Originally committed as revision 3310 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-07-14 01:32:14 +00:00
Mike Melanson
9be653d0e9 cvs diff before cvs commit 
Originally committed as revision 3240 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-19 14:51:46 +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
573ab01eb7 ac3 bugfix, bug found by "Ben Cooley" <bcooley at dstreamtech dot com> 
Originally committed as revision 3209 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-09 00:38:52 +00:00
Michael Niedermayer
3c895fc098 correctly interleave packets during encoding 
dts/pts fixed for streamcopy
dont use coded_frame->key_frame hack in muxers, use AVPacket.flags instead

Originally committed as revision 3171 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-29 18:50:31 +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
Sidik Isani
9e9080b6f0 dont add padding in the middle of the data patch by (Sidik Isani <isani at cfht dot hawaii dot edu>) 
Originally committed as revision 3158 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-25 23:06:00 +00:00
Michael Niedermayer
cdd5034f89 store index for seeking in the native timebase of each stream 
set correct timebase for nut
merge mpeg-ts seeking with existing seeking code
10l fix in mpegts (27mhz vs. 90khz)

Originally committed as revision 3152 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-23 16:26:12 +00:00
Hauke Duden
224944895e mpeg SVCD compatibility, SCR fixes, standard compliance 
- fixed VBR+constrained bitstream header flags for non-VCD
- more sane (and SVCD compatible) value for video stream->max_buffer_size
- always write at least one PES header stuffing byte for MPEG-2 to
prevent accidental start code generation
- do not write more than 16 stuffing bytes in a PES header (not
allowed). Use padding packets instead.
- include a PES extension in the first MPEG-2 packet
- fill the first pack of SVCD files with padding
- "sanity hack" that prevents the SCR from overtaking the PTS for non-VCD
- fixed VCD PTS values to correspond to the SCR
- always include DTS in the first SVCD packet (fixes lots of
compatibility problems with DVD players)

patch by (Hauke Duden <H.NS.Duden at gmx dot net>)

Originally committed as revision 3078 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-26 22:16:06 +00:00
Dmitry Borisov
df70de1f61 Mpeg start codes patch by ("Dmitry Borisov" <jbors at mail dot ru>) 
Originally committed as revision 3046 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-23 21:02:01 +00:00
Michael Niedermayer
8d14a25c3e moving nearly identical binary search code from nut/mpeg/asf to utils.c 
Originally committed as revision 3003 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-12 16:50:03 +00:00
Falk Hüffner
7906085fcc warning patrol 
Originally committed as revision 2925 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-24 23:32:48 +00:00
Michel Bardiaux
bc874daea8 av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>) 
Originally committed as revision 2840 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-03 15:41:21 +00:00
Hauke Duden
2451592652 improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>) 
- the first audio and video packs now contain only a system header and lots
  of padding.
  - no system headers in any packs other than the first ones
  - the two system headers only contain information about "their" stream
  - fixed some header values (muxrate, some flags, ...) so that they have the
  values specified by the standard
  - padding packs are inserted if the mux rate would be below 75 packs per
  second (the rate must not be below or above that value).
  - fixed the SCR of the packs
  - 20 zero bytes are now inserted at the end of each audio pack, after the
  data packet

Originally committed as revision 2804 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-19 22:34:13 +00:00