generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
77,851 Commits 24 Branches 241 Tags 173 MiB
2bbc7e9625
Commit Graph

548 Commits

Author SHA1 Message Date
Diego Biurrun
43b6c3eb18 mpegts: Wrap #ifdef DEBUG and av_hex_dump_log() combination in a macro. 2011-06-03 15:43:34 +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
Kieran Kunhya
5501afa6ee Export PCR pid 2011-05-28 04:11:26 +02:00
Kieran Kunhya
24adef142f Export more transport stream information. 
with minor addition to the comment by michael
 2011-05-28 04:11:26 +02:00
Kieran Kunhya
fa12fb3b00 Output MPEG-TS stream identifiers. 
with changes by michael to simplify API
 2011-05-28 04:11:26 +02:00
Michael Niedermayer
39e4206dc6 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (32 commits)
  doc: create separate section for audio encoders
  swscale: Remove orphaned, commented-out function declaration.
  swscale: Eliminate rgb24toyv12_c() duplication.
  Remove h263_msmpeg4 from MpegEncContext.
  APIchanges: Fill in git hash for fps_probe_size (30315a8)
  avformat: Add fpsprobesize as an AVOption.
  avoptions: Return explicitly NAN or {0,0} if the option isn't found
  rtmp: Reindent
  rtmp: Don't try to do av_malloc(0)
  tty: replace AVFormatParameters.sample_rate abuse with a private option.
  Fix end time of last chapter in compute_chapters_end
  ffmpeg: get rid of useless AVInputStream.nb_streams.
  ffmpeg: simplify managing input files and streams
  ffmpeg: purge redundant AVInputStream.index.
  lavf: deprecate AVFormatParameters.channel.
  libdc1394: add a private option for channel.
  dv1394: add a private option for channel.
  v4l2: reindent.
  v4l2: add a private option for channel.
  lavf: deprecate AVFormatParameters.standard.
  ...

Conflicts:
	doc/APIchanges
	doc/encoders.texi
	ffmpeg.c
	libavdevice/alsa-audio.h
	libavformat/version.h
	libavutil/opt.c
	libswscale/rgb2rgb.h
	libswscale/rgb2rgb_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-26 03:28:22 +02:00
Anton Khirnov
fb37d57347 lavf: deprecate AVFormatParameters.mpeg2ts_raw. 
It doesn't do anything except produce an error message when set.
 2011-05-25 15:20:25 +02:00
Anton Khirnov
17a5556db5 mpegts: add compute_pcr option. 
Deprecate the corresponding AVFormatParameters field.
 2011-05-25 15:20:25 +02:00
Baptiste Coudurier
6ae38aa3ce mpegts: do not output known sized packet if an unbounded packet is already queued. 
Fix issue #2624.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-05-12 13:04:58 +02:00
Michael Niedermayer
612122b187 Merge remote branch 'qatar/master' 
* qatar/master: (32 commits)
  10-bit H.264 x86 chroma v loopfilter asm
  Port SMPTE S302M audio decoder from FFmbc 0.3. [Copyright headers corrected]
  Fix crash of interlaced MPEG2 decoding
  h264pred: fix one more aliasing violation.
  doc/APIchanges: fill in missing hashes and dates.
  flacenc: use proper initializers for AVOption default values.
  lavc: deprecate named constants for deprecated antialias_algo.
  aac: workaround for compilation on cygwin
  swscale: extend YUV422p support to 10bits depth
  tiff: add support for inverted FillOrder for uncompressed data
  Remove unused softfloat implementation.
  h264pred: fix aliasing violations.
  rotozoom: Eliminate French variable name.
  rotozoom: Check return value of fread().
  rotozoom: Return an error value instead of calling exit().
  rotozoom: Make init_demo() return int and check for errors on invocation.
  rotozoom: Drop silly UINT8 typedef.
  rotozoom: Drop some unnecessary parentheses.
  rotozoom: K&R coding style cosmetics
  rtsp: Only do keepalive using GET_PARAMETER if the server supports it
  ...

Conflicts:
	Changelog
	cmdutils.c
	doc/APIchanges
	doc/general.texi
	ffmpeg.c
	ffplay.c
	libavcodec/h264pred_template.c
	libavcodec/resample.c
	libavutil/pixfmt.h
	libavutil/softfloat.c
	libavutil/softfloat.h
	tests/rotozoom.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-12 04:51:24 +02:00
Baptiste Coudurier
9aa91043f3 Port SMPTE S302M audio decoder from FFmbc 0.3. 2011-05-11 17:25:06 +02:00
Reimar Döffinger
5631729c3d Increase TS packet size detection buffer. 
Fixes warning message with ticket #68.
 2011-05-07 17:38:18 +02:00
Reimar Döffinger
90f5e991be Assume some TS packet size instead of failing completely. 
Fixes ticket #68.
 2011-05-07 17:38:18 +02:00
Michael Niedermayer
be315a3232 Merge remote branch 'qatar/master' 
* qatar/master:
Duplicate  AMV: disable DR1 and don't override EMU_EDGE
Duplicate  lavf: inspect more frames for fps when container time base is coarse
Wrong and we have correct fix: Fix races in default av_log handler
  vorbis: Replace sized int_fast integer types with plain int/unsigned.
  Remove disabled non-optimized code variants.
NO  bswap.h: Remove disabled code.
  Remove some disabled printf debug cruft.
  Replace more disabled printf() calls by av_dlog().
NO  tests: Remove disabled code.
NO  Replace some commented-out debug printf() / av_log() messages with av_dlog().
  vorbisdec: Replace some sizeof(type) by sizeof(*variable).
NO  vf_fieldorder: Replace FFmpeg by Libav in license boilerplate.

Conflicts:
	libavcodec/h264.c
	libavcodec/vorbisdec.c
	libavutil/log.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-30 01:58:26 +02:00
Diego Biurrun
2e15305b70 Remove some disabled printf debug cruft. 2011-04-29 20:00:53 +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
efb5fa79f5 Merge remote branch 'qatar/master' 
* qatar/master: (37 commits)
  In avcodec_open(), set return code to an error value only when an error occurs instead of unconditionally at the start of the function.
  lavc: remove reference to opt.h from Makefile.
  prefer avio_check() over url_exist()
  avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols
  lavu: remove misc disabled cruft
  lavu: remove FF_API_OLD_IMAGE_NAMES cruft
NOT PULLED  lavu: remove FF_API_OLD_EVAL_NAMES cruft
  lavc: remove misc disabled cruft.
  lavc: remove the FF_API_INOFFICIAL cruft.
  lavc: remove the FF_API_SET_STRING_OLD cruft.
  lavc: remove the FF_API_USE_LPC cruft.
  lavc: remove the FF_API_SUBTITLE_OLD cruft.
  lavc: remove the FF_API_VIDEO_OLD cruft.
  lavc: remove the FF_API_AUDIO_OLD cruft.
  lavc: remove the FF_API_OPT_SHOW cruft.
  lavc: remove the FF_API_MM_FLAGS cruft.
  lavf: remove misc disabled cruft.
  lavf: remove FF_API_INDEX_BUILT cruft
  lavf: remove FF_API_URL_CLASS cruft.
  lavf: remove FF_API_SYMVER cruft
  ...

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-20 04:48:23 +02:00
Anton Khirnov
761ad42968 lavf: remove FF_API_MAX_STREAMS cruft 2011-04-19 18:28:38 +02:00
Michael Niedermayer
1f3a1fa921 Fix gazeta-20090408-1456-aa.ts 
regression introduced by 15957b197a
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-06 01:09:04 +02:00
Michael Niedermayer
3e3ea93b3c mpegts: Put CODEC_ID_NONE check back that was removed by mistake in 5b56ad03 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-05 00:48:52 +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
Michael Niedermayer
7ac167493e Merge remote-tracking branch 'newdev/master' 
* newdev/master:
  mpegts: propagate avio EOF in read_packet()
  configure: Initial support for --target-os=symbian
  Fixed-point FFT and MDCT
  Include dependencies for test programs
  ac3enc: simplify sym_quant()
  flvdec: read index stored in the 'keyframes' tag.
  mov: Add support for zero-sized stsc runs.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-01 02:58:15 +02:00
Jindrich Makovicka
e006d71fa8 mpegts: propagate avio EOF in read_packet() 
Allows distinguishing between EOF and IO error in read_packet return code.

Signed-off-by: Jindrich Makovicka <makovick@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-03-31 19:46:28 +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
Anssi Hannula
b543e1dccf mpegts: add all stream languages into metadata 
This is used at least on some older DVB broadcasts for dual-mono audio
tracks.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 6a7e074eb9)
 2011-03-08 02:09:45 +01:00
Hendrik Leppkes
a2fc93f700 Flag DVB subtitles for the hard hearing appropriately using their component_type id. 
This is based on the component_type definition in the DVB SI spec [1].

[1]: http://www.dvb.org/technology/standards/a038_DVB-SI_dEN300468v1.12.1.pdf

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 789936dbbd)
 2011-03-08 02:09:44 +01:00
Anton Khirnov
1447dc59de avio: deprecate url_fgetc and remove all it uses 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e51975392d)
 2011-03-08 02:09:17 +01: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
Anssi Hannula
6a7e074eb9 mpegts: add all stream languages into metadata 
This is used at least on some older DVB broadcasts for dual-mono audio
tracks.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 15:00:53 -05:00
Hendrik Leppkes
789936dbbd Flag DVB subtitles for the hard hearing appropriately using their component_type id. 
This is based on the component_type definition in the DVB SI spec [1].

[1]: http://www.dvb.org/technology/standards/a038_DVB-SI_dEN300468v1.12.1.pdf

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 14:44:29 -05:00
Anton Khirnov
e51975392d avio: deprecate url_fgetc and remove all it uses 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 10:51:21 -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
Baptiste Coudurier
4ea02a9a71 In mpegts demuxer, do not output known sized packet if an unbounded packet 
is already queued. Fix issue #2624.
 2011-02-27 16:20:00 -08: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
ae99313aa5 avio: move init_put_byte() to a new private header and rename it 
init_put_byte should never be used outside of lavf, since
sizeof(AVIOContext) isn't part of public ABI.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e731b8d872)
 2011-02-20 19:05:47 +01: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
e731b8d872 avio: move init_put_byte() to a new private header and rename it 
init_put_byte should never be used outside of lavf, since
sizeof(AVIOContext) isn't part of public ABI.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-20 08:37:31 -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
Anssi Hannula
e2db6b590f mpegts: set st->disposition according to ISO 639 language descriptor 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 60e7306643)
 2011-02-15 16:32:32 +01:00
Anssi Hannula
60e7306643 mpegts: set st->disposition according to ISO 639 language descriptor 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-02-14 23:18:26 +00:00
Vladimir Pantelic
6ff532b95d mpegts: remove unused macro MAX_SCAN_PACKETS 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit f4c79d1e0b)
 2011-02-11 02:54:08 +01:00
Vladimir Pantelic
f4c79d1e0b mpegts: remove unused macro MAX_SCAN_PACKETS 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-02-09 16:56:51 +00:00
Vasyl' Vavrychuk
e5e3897b64 mpegts: remove get_pts duplicate of ff_parse_pes_pts. 
Signed-off-by: Vasyl' Vavrychuk <vvavrychuk@gmail.com>
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 665132e620)
 2011-01-31 18:25:44 +01:00
Vasyl' Vavrychuk
665132e620 mpegts: remove get_pts duplicate of ff_parse_pes_pts. 
Signed-off-by: Vasyl' Vavrychuk <vvavrychuk@gmail.com>
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-30 16:39:27 +00:00
Luca Barbato
9ef5a9deaf Replace dprintf with av_dlog 
dprintf clashes with POSIX.1-2008
(cherry picked from commit dfd2a005eb)
 2011-01-30 03:41:48 +01:00
Luca Barbato
dfd2a005eb Replace dprintf with av_dlog 
dprintf clashes with POSIX.1-2008
 2011-01-29 23:55:37 +01: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
Georgi Chorbadzhiyski
d7b219ca96 Set service_provider and service_name in mpegts demuxer 
Set service_provider and service_name in mpegts demuxer, previously
name and provider_name were set but since the muxer uses service_provider
and service_name use them.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e8315e7881)
 2011-01-21 20:36:00 +01:00
Georgi Chorbadzhiyski
e8315e7881 Set service_provider and service_name in mpegts demuxer 
Set service_provider and service_name in mpegts demuxer, previously
name and provider_name were set but since the muxer uses service_provider
and service_name use them.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-20 13:42:27 +00:00
Peter Ross
cc9038e95c add ff_parse_mpeg2_descriptor; make MPEG2 descriptor parsing routines available to other modules. 
Originally committed as revision 26125 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-29 12:45:31 +00:00
Baptiste Coudurier
74f726209f In ts demuxer, if pes packet size is < ts packet, honor pes packet and skip padded data. 
Fixes issue #2392.

Originally committed as revision 25841 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-29 03:43:56 +00:00
Stephen D'Angelo
c538eb51c6 In TS demuxer, create the AVStream during pmt parsing if the pes stream does not 
yet have it, this can happen if the pes stream contain data but no pes header
has been encoutered yet.
Patch by Stephen D'Angelo, SDAngelo at evertz dot com.

Originally committed as revision 25823 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-25 00:55:02 +00:00
Baptiste Coudurier
b795ff97e5 In TS demuxer, keep the pmt filter open to parse all pmt sections, 
based on patch by Stephen D'Angelo, SDAngelo at evertz dot com.

Originally committed as revision 25822 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-25 00:29:44 +00:00
Baptiste Coudurier
8ee764b020 Remove some warnings 
Originally committed as revision 25808 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-23 01:10:21 +00:00
Baptiste Coudurier
175272cb07 10l, fix memleak, forgot to free mp4_dec_config_descr 
Originally committed as revision 25807 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-23 01:04:49 +00:00
Baptiste Coudurier
798c6facb7 In ts demuxer, support aac flexmux using extradata in iods, issue #2346 
Originally committed as revision 25806 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-23 00:51:12 +00:00
Janne Grunau
915bfa33d1 mpegts: support LATM syntax 
Originally committed as revision 25643 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-02 08:32:33 +00:00
Aurelien Jacobs
54036be11a rename LAVF_API_* defines to FF_API_* to clarify that it is not public API 
Originally committed as revision 24825 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-18 20:34:31 +00:00
Aurelien Jacobs
072e3efd1b add LAVF_API_MAX_STREAMS define to disable the deprecated MAX_STREAMS API 
Originally committed as revision 24817 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-17 19:30:21 +00:00
Aurelien Jacobs
6b2b337657 get rid of MAX_STREAMS limit in mpegts 
Originally committed as revision 24753 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-09 23:21:08 +00:00
Martin Storsjö
8dd25c52cb mpegts: Warn if unable to seek back 
Originally committed as revision 24477 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-24 08:43:52 +00:00
Reimar Döffinger
b834becdae Pass the composition and ancillary ID for DVB subtitles via extradata instead 
of sub_id, this allows detecting when that information is not available and
just decode everything.
In addition extradata is required for many codecs and thus in contrast to
sub_id generally already passed on by any programs using libav*.
Also ask for a sample if we encounter a stream with multiple/changing IDs.

Originally committed as revision 24238 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-14 17:28:40 +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
b74f67eb17 In ts demuxer, output pes packet as soon as they are complete. 
This is needed for subtitles where packets are infrequent.
Patch by Janne Grunau, janne-ffmpeg at jannau dot net.

Originally committed as revision 23157 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-18 17:28:07 +00:00
Stefano Sabatini
2ef6c1242a Mark av_metadata_set() as deprecated, and use av_metadata_set2() 
in its place.

av_metadata_set() is going to be dropped at the next major bump.

Originally committed as revision 22961 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-25 14:27:42 +00:00
Baptiste Coudurier
0403c2e3e4 Disable LATM AAC in mpegts, this is not supported and produce too many 
bug reports. Also warn the user about it.

Originally committed as revision 22947 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-22 20:34:30 +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
Aurelien Jacobs
588af13fee rename av_program_add_stream_index to ff_program_add_stream_index 
it is an internal function, not part of public API

Originally committed as revision 22561 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 23:14:07 +00:00
Stefano Sabatini
4837bb52d2 Replace last occurrence of the deprecated match_ext() with 
av_match_ext().

Originally committed as revision 22351 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 23:46:04 +00:00
Måns Rullgård
0694a009b6 Fix build 
Originally committed as revision 21602 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-01 23:30:30 +00:00
Alexis Ballier
9125806e34 Fix warnings about implicit function declaration when compiling rtpdec.c 
Patch by Alexis Ballier, alexis D ballier A gmail

Originally committed as revision 21601 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-01 23:10:04 +00:00
Baptiste Coudurier
10061cd648 remove useless type declarations 
Originally committed as revision 21206 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-13 22:52:22 +00:00
Baptiste Coudurier
609d864611 move code to avoid forward declaration 
Originally committed as revision 20475 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-08 03:27:58 +00:00
Baptiste Coudurier
b3f9f7a333 Let pmt override stream info when encoutered later in the ts file. 
Do not set codec id based on pes start code, this is unreliable.
Fix gazeta-20090408-1456-aa.ts

Originally committed as revision 20474 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-08 03:17:08 +00:00
Carl Eugen Hoyos
28f008a9d3 Support some LATM AAC streams (they can be decoded with MPlayer). 
Originally committed as revision 20472 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-07 23:44:56 +00:00
Francesco Lavra
e58992e41f Support demuxing teletext in DVB streams. 
Original patch by Francesco Lavra, francescolavra interfree it

Originally committed as revision 20414 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-29 10:46:16 +00:00
Baptiste Coudurier
45a49840f3 handle_packets takes number of packets as arg, avoid reading too much 
Originally committed as revision 20288 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 20:11:32 +00:00
Baptiste Coudurier
1303d62d84 Increase max resync size, fix demuxing of dvgrab-2009.03.28_19-07-22.m2t 
Print error when max resync size is reached and return EAGAIN instead of
INVALIDDATA, so user can retry if wanted.

Originally committed as revision 20286 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 20:08:13 +00:00
Carl Eugen Hoyos
0096d766b9 Allow demuxing of E-AC3 (stream type 0x84) in MPEG-TS. 
Originally committed as revision 20200 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-10 21:17:52 +00:00
Ian Caulfield
63380b5e54 Allow the combined TrueHD/AC3 tracks on Blu-Ray discs to be demuxed as two separate streams. 
Patch by Ian Caulfield, ian D caulfield A gmail

Originally committed as revision 20168 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-05 08:38:39 +00:00
Baptiste Coudurier
8bb7dda2f7 ensure pes buffer is set to avoid segv 
Originally committed as revision 19836 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-13 20:08:47 +00:00
Baptiste Coudurier
8956f68014 reset pes state to skip after flushing, avoid segv with dvgrab-2009.03.28_19-07-22.m2t 
Originally committed as revision 19835 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-13 20:06:49 +00:00
Ivan Schreter
af8aae3fa3 disable new seeking code in mpeg-ts per #ifdef (use old read_seek by default) 
Originally committed as revision 19788 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-06 15:59:32 +00:00
Ivan Schreter
608be2acef Cosmetic changes in read_seek* routines. 
Originally committed as revision 19723 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-26 22:33:48 +00:00
Christian Schmidt
5dd3707b8d Decoder for LPCM as used in Bluray discs. 
Patch by Christian Schmidt, schmidt digadd de

Originally committed as revision 19722 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-26 22:10:35 +00:00
Stephen Backway
c58b82a29b Add Bluray Subtitle Support 
Patch by Stephen Backway, stev391 A exemail D com D au

Originally committed as revision 19699 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-25 08:47:39 +00:00
Måns Rullgård
cf5ec60740 mpegts: change variable-length array to fixed length 
The difference between 188 and 204 is not worth worrying about.

Originally committed as revision 19697 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-24 21:42:25 +00:00
Ivan Schreter
a8dd8dc6e9 Use generic multi-stream key frame finding routine to implement read_seek2 and map 
read_seek to read_seek2.

Originally committed as revision 19681 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-22 16:07:50 +00:00
Baptiste Coudurier
0fd7cf116b init pes dts and pts to AV_NOPTS_VALUE, fix issue #1297 
Originally committed as revision 19546 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-30 18:29:06 +00:00
Baptiste Coudurier
d46c84ea31 Stop parsing in read_header only after finding pmt, and 
do not close pat filter so further pmt can be parsed.
Fix issue #1294.

Originally committed as revision 19530 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-29 02:17:08 +00:00
Baptiste Coudurier
d23612efe1 Only set CODEC_ID_PROBE when a packet from a stream having a PES header 
is read.

Originally committed as revision 19273 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-25 19:01:16 +00:00
Wolfram Gloger
896f2b3212 add 0-termination in table, patch by Wolfram Gloger, wmglo at dent dot med dot uni-muenchen dot de 
Originally committed as revision 19229 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-20 06:09:30 +00:00
Baptiste Coudurier
b2984add80 do not parse full header for private streams 
Originally committed as revision 19075 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-02 07:53:44 +00:00
Baptiste Coudurier
617c461625 correctly handle maximum streams limit 
Originally committed as revision 19074 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-02 07:30:19 +00:00
Baptiste Coudurier
1c4df2ab24 export data from private streams 
Originally committed as revision 19073 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-02 07:26:58 +00:00
Baptiste Coudurier
4a01b3c714 initialize pes state to skip 
Originally committed as revision 19029 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 08:47:40 +00:00
Baptiste Coudurier
1f07654330 print reg desc in a more friendly way 
Originally committed as revision 19021 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 04:47:30 +00:00
Baptiste Coudurier
ad183ff4e2 give context to dprintf 
Originally committed as revision 19020 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 04:45:51 +00:00
Baptiste Coudurier
fc72ad1990 print registration descriptor in debug 
Originally committed as revision 19019 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 04:41:47 +00:00
Baptiste Coudurier
84c7d45e02 0x7a is E-AC3 descriptor 
Originally committed as revision 19017 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 04:35:05 +00:00
Baptiste Coudurier
7103a77b4d set codec_tag to stream type, so user can deal with it 
Originally committed as revision 19013 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 04:10:15 +00:00
Baptiste Coudurier
5b3c4c8ac6 set codec_tag to registration descriptor if present 
Originally committed as revision 19012 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 04:04:20 +00:00
Baptiste Coudurier
ffdbada6c1 add streams even if they are not present in PMT, fix #1092 and #835 
Originally committed as revision 19011 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 03:55:23 +00:00
Baptiste Coudurier
e6eb74d84c remove no longer needed fake dvbsub stream type 
Originally committed as revision 19010 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 03:46:24 +00:00
Baptiste Coudurier
f2c357d95d reindent 
Originally committed as revision 19009 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 03:45:45 +00:00
Baptiste Coudurier
ed68efad8b remove no longer needed init 
Originally committed as revision 19008 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 03:44:03 +00:00
Baptiste Coudurier
6a2a50f81f factorize 
Originally committed as revision 19007 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 03:40:36 +00:00
Baptiste Coudurier
f42d1d824e simplify and merge 
Originally committed as revision 19006 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 03:35:29 +00:00
Baptiste Coudurier
08f94e989f move new_pes_av_stream to avoid forward declaration 
Originally committed as revision 19005 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 03:12:25 +00:00
Baptiste Coudurier
2fef7b5374 remove defines 
Originally committed as revision 19004 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 03:02:12 +00:00
Baptiste Coudurier
8430f3ecb8 rework stream type and codec identification 
Originally committed as revision 19003 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 02:56:15 +00:00
Baptiste Coudurier
40b0872a56 cosmetics, reindent, remove useless braces, whitespaces 
Originally committed as revision 19002 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 00:33:37 +00:00
Baptiste Coudurier
64ab5fa3df export all streams in ts demuxer 
Originally committed as revision 19001 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 00:31:47 +00:00
Baptiste Coudurier
6c7c2f7bb3 support AVDISCARD_ALL in mpegts demuxer 
Originally committed as revision 18964 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-27 01:29:55 +00:00
Baptiste Coudurier
bdfa98249a return error in mpegts_push_data and propagate it 
Originally committed as revision 18963 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-27 00:56:31 +00:00
Baptiste Coudurier
64d882155d 10l, forgot ';', fix compilation 
Originally committed as revision 18962 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-27 00:48:39 +00:00
Baptiste Coudurier
a5685be502 check that len is not negative 
Originally committed as revision 18961 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-27 00:46:20 +00:00
Baptiste Coudurier
0c1375575a demux whole PES packets from TS 
Originally committed as revision 18960 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-27 00:44:00 +00:00
Baptiste Coudurier
e9859317eb move DEBUG define before include to get dprintf 
Originally committed as revision 18956 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-26 20:13:03 +00:00
Baptiste Coudurier
c950c25ac0 remove useless wrapper 
Originally committed as revision 18465 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-12 09:04:12 +00:00
Baptiste Coudurier
7b9677f6b0 remove useless wrapper 
Originally committed as revision 18463 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-12 08:52:16 +00:00
Baptiste Coudurier
ebcf352a25 replace DEBUG_SI with DEBUG and use dprintf 
Originally committed as revision 18458 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-12 03:08:46 +00:00
Baptiste Coudurier
495b37664d Set stream type to ac3 if registration descriptor is present. 
Based on patch by Nico Sabi, nicola dot sabbi at poste dot it

Originally committed as revision 18457 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-12 02:39:16 +00:00
Baptiste Coudurier
4f1db48e88 simplify registration descriptor parsing with bytestream get functions 
Originally committed as revision 18456 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-12 02:32:02 +00:00
Björn Axelsson
a4d2af9b96 Ok, ts demuxer is more complicated than I thought 
Revert r18454 and fix correctly #700
Stop parsing if end of buffer is reached while reading
patch by Björn Axelsson, bjorn dot axelsson at intinor dot se

Originally committed as revision 18455 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-12 02:19:40 +00:00
Baptiste Coudurier
2b97246ec2 fix end of buffer check, fix hang_read_header.h264.ts 
Originally committed as revision 18454 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-12 01:37:34 +00:00
Baptiste Coudurier
5f01c1258f avoid creating a new stream not referenced in pmt since it cannot be associated to a program, fix issue 835 
Originally committed as revision 18137 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-22 02:04:28 +00:00
Ivan Schreter
4c6b49bf74 Change TS seeking so it returns position/timestamp of a key frame. 
Patch by Ivan Schreter, schreter gmx net

Originally committed as revision 17665 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-28 18:35:53 +00:00
Aurelien Jacobs
0868119106 use new metadata API in mpegts demuxer 
Originally committed as revision 17112 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-10 00:25:21 +00:00
Jindřich Makovička
dcd913d9ed Fix minor memory leak. 
Patch by Jindrich Makovicka, approved by mans.

Originally committed as revision 17021 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-06 20:30:18 +00:00
Michael Niedermayer
1558d0b910 Fix probe & demuxing of Topfield 58XXPVR and 68XXPVR (topfield.rec) 
Originally committed as revision 16968 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-03 11:01:57 +00:00
Baptiste Coudurier
14120c95f0 set pts and dts when only pts is present, according to specs 
Originally committed as revision 16734 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-23 22:16:31 +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 Biurrun
6a5d31ac25 Fix build: Add intreadwrite.h and bswap.h #includes where necessary. 
Originally committed as revision 16556 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 22:19:48 +00:00
Måns Rullgård
8c39a7582d mpegts: replace Program_t typedef with "struct Program" 
Originally committed as revision 16086 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-13 00:04:34 +00:00
Diego Biurrun
ecfb51d1c2 Add necessary header for av_set_program_name and av_program_add_stream_index. 
Originally committed as revision 15996 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-03 23:04:30 +00:00
Diego Biurrun
bad4063740 Move declaration of av_set_program_name and av_program_add_stream_index 
to a more sensible place.

Originally committed as revision 15991 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-03 16:47:07 +00:00
Diego Biurrun
9686df2be5 Delete unnecessary 'extern' keywords. 
Originally committed as revision 15990 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-03 15:23:30 +00:00
Diego Biurrun
910f02a054 spelling cosmetics 
Originally committed as revision 15518 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-02 16:28:58 +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
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
Anuradha Suraparaju
f4bba2015a Dirac encapsulation in MPEG-TS 
patch by Anuradha Suraparaju, anuradha rd.bbc.co uk

Originally committed as revision 14734 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-13 19:29:35 +00:00
Michael Niedermayer
452a398fd6 Fix misdetection of H.264 in mpegts as mpeg1video in mpegts. 
Fixes maybeH264_dumpstream

Originally committed as revision 14445 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-27 23:06:22 +00:00
Måns Rullgård
c6002ea14d MPEGTS: Improve probe function 
When a sync byte is found, check that transport_error_indicator is zero,
and adaptation_field_control is valid (non-zero).

Originally committed as revision 14274 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-18 01:07:17 +00:00
Erik Hovland
72e043dd0f One-bit bitfields should probably be unsigned. Unfortunately, it is left 
up to the compiler on how one bit fields are treated. gcc treats one-bit
bitfields as signed and allows for the -funsigned-field parameter. Other
compilers (like Sun C) treat one-bit bitfields as unsigned no matter what.
Patch by Erik Hovland erik hovland org

Originally committed as revision 14131 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-08 23:20:22 +00:00
Baptiste Coudurier
ade8d8b939 uniformize AVStream->priv_data freeing in av_close_input_stream 
Originally committed as revision 13838 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-20 17:22:56 +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
Diego Biurrun
245976da2a Use full path for #includes from another directory. 
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-09 11:56:36 +00:00
Diego Biurrun
ccd425e799 Remove unnecessary parentheses from return calls. 
Originally committed as revision 13069 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-06 09:16:36 +00:00
Michael Niedermayer
81d5ae6dec Fixing memleaks. 
Originally committed as revision 12943 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-24 22:16:00 +00:00
Michael Niedermayer
5fd63f3c3b Ensure that the timestamp reading code used for seeking chooses a position 
which is a multiple of the packet size from the last packet start instead
of the file start. This fixes some seek issues with randomly cut ts files
and the mysterious "4 byte PCR somehing MTS something bug".

Originally committed as revision 12932 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-23 21:16:25 +00:00
Michael Niedermayer
056f6b8f09 Using the same probe function in 2 formats is not a good idea. 
Originally committed as revision 12836 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-15 13:48:46 +00:00
Nico Sabbi
a45b40c496 treat stream_type==0x82 as AUDIO_DTS when the program has a REGISTRATION_DESCRIPTOR with the value HDMV; approved by Mans 
Originally committed as revision 12180 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-23 10:57:38 +00:00
Aurelien Jacobs
3abe5fbdc4 improve CRC API 
- don't export any global var
 - provide either generated or hardcoded tables

Originally committed as revision 11409 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-04 23:09:58 +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
Jeff Downs
28af284cfb When new streams are detected, look for old filters and close them out. 
This avoids crashes seen when legitimate streams are found on PID 0x11 instead
of DVB SDT.
Fixes regression detailed in Roundup issue 138.

Originally committed as revision 11050 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-17 03:14:43 +00:00
Nico Sabbi
aa237f4535 associate to each AVProgram the indexes of the AVStreams contained in it 
Originally committed as revision 10820 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-20 08:29:05 +00:00
Nico Sabbi
172d1171d2 added structures and code to keep track of pids<->programs mapping: it's needed 
to decide which pids to discard in order to feed to the caller only AVProgram(s)
that have the AV_DISCARD_ALL flag not set

Originally committed as revision 10581 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-25 20:58:37 +00:00
Nico Sabbi
1d257254f1 replaced custom tracking of programs/services with calls to with av_new_program() 
Originally committed as revision 10580 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-25 20:49:11 +00:00
Aurelien Jacobs
6369638bf0 loosen dependencies over allformats.h 
Originally committed as revision 10513 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-16 23:00:44 +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
Alex Beregszaszi
5b83843f43 fix compilation with assert 
Originally committed as revision 9619 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-13 00:49:40 +00:00
Måns Rullgård
b474d1f3fa update SectionCallback and PESCallback typedefs to match functions 
Originally committed as revision 9542 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-08 13:42:51 +00:00
Ronald S. Bultje
80fb82346e Use AV_RB* macros where appropriate. 
patch by Ronald S. Bultje, rsbultje gmail com
thread: Re: [FFmpeg-devel] remove int readers
date: Sat, 23 Jun 2007 09:32:12 -0400

Originally committed as revision 9499 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-06 09:32:34 +00:00
Michael Niedermayer
b3e104366a simplify 
Originally committed as revision 9258 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-08 17:34:37 +00:00
Michael Niedermayer
2bb486a5e6 remove now unused "global" pcr_pid 
Originally committed as revision 9257 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-08 17:26:05 +00:00
Michael Niedermayer
dbf6b678fc proper per stream pcr_pid support by (Wolfram Gloger wmglo dent.med.uni-muenchen@de ) 
Originally committed as revision 9256 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-08 17:21:29 +00:00
Michael Niedermayer
e39291dfcf partially revert r2931 (Support raw mpegts streams from dvr) 
the change was wrong

Originally committed as revision 9219 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-04 22:23:05 +00:00
Michael Niedermayer
04ec18b8b3 harmless typo 
Originally committed as revision 9210 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-04 14:54:33 +00:00
Michael Niedermayer
28f03d0494 fix indention 
Originally committed as revision 9209 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-04 14:53:47 +00:00
Michael Niedermayer
ad39abcdd9 remove duplicate PAT scaning code and actual PAT scan 
also disabling the nonsense 3yr old rawts change (it would after the
above chage totally break the demuxer if its left enabled)

Originally committed as revision 9208 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-04 14:44:52 +00:00
Michael Niedermayer
4dc8a963d1 unused variables 
Originally committed as revision 9207 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-04 14:20:07 +00:00
Michael Niedermayer
90d13e30d5 dont rescan for information on each pid, but rather do it just once by 
opening 1 filter for each at the same time

Originally committed as revision 9206 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-04 14:17:43 +00:00
Michael Niedermayer
ecc31d1d8e move structs and enums to top of file so they can be used 
Originally committed as revision 9205 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-04 14:11:54 +00:00
Michael Niedermayer
4d9a577e30 passing MpegTSFilter to the filters instead of a random void *opaque 
code is simler and the filters now know the pid they are filtering so one
filter callback can be used with more then one pid at the same time

Originally committed as revision 9204 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-04 13:57:00 +00:00
Michael Niedermayer
37dfd6333d do not perform SDT scan at the begin (this avoids a timeconsuming search for 
optional info) instead fill SDT info in and update it as we stumble across it

Originally committed as revision 9201 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-04 12:19:38 +00:00
Michael Niedermayer
657ced8cdb make new_service() update existing info sanely 
Originally committed as revision 9200 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-04 11:46:59 +00:00
Michael Niedermayer
0618bb1c5b remove fake service/provider names used for PAT 
this allows us to distingush if the info came from SDT or PAT and will
allow to dyamically fill info in ...

Originally committed as revision 9199 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-04 11:25:33 +00:00
Benoit Fouet
a45ec41409 Indentation 
Originally committed as revision 9197 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-04 08:53:08 +00:00
Michael Niedermayer
b91811af83 get rid of if(1) 
Originally committed as revision 9179 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-02 23:14:38 +00:00
Michael Niedermayer
9deb6d71b8 get rid of one layer of callback obfuscation 
Originally committed as revision 9178 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-02 23:11:17 +00:00
Michael Niedermayer
b229219417 kill completely idiotic code which hides all but 2 streams 
Originally committed as revision 9177 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-02 23:04:46 +00:00
Michael Niedermayer
165f503a27 correct implementation of "try with auto_guess if first detection fails" 
(untested)

Originally committed as revision 9175 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-02 21:48:49 +00:00
Michael Niedermayer
d287b04b6d revert r4802 (try with auto_guess if first detection fails) 
this change is broken, 3/4 of the code added is unreachable, ill implement
it correctly in a moment

Originally committed as revision 9174 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-02 21:44:20 +00:00
Michael Niedermayer
38c48be213 split mpeg2ts_raw mode into its own demuxer using such a flag is an incredibly dirty hack 
Originally committed as revision 9173 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-02 20:57:31 +00:00
Glenn A. Serre
828bb5f1f6 variable initialization (because of a gcc warning) 
patch by Glenn A. Serre gaserre spiresoftware com

Originally committed as revision 9146 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-29 08:19:37 +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
Panagiotis Issaris
750f0e1f8b Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log() 
which use av_log() for logging instead of fprintf().

Originally committed as revision 8339 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-12 14:17:26 +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
Nico Sabbi
cf10ee184f demux VC1 in mpegts 
Originally committed as revision 7902 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-09 20:34:24 +00:00
Michel Bardiaux
f0ee3ea619 Add some context to av_log calls. 
patch by Michel Bardiaux, mbardiaux mediaxim be

Originally committed as revision 7774 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-31 08:29:24 +00:00
Daniel Kristjansson
e995cfca28 mpegts-documentation-only.patch -- adds documentation patch by Daniel Kristjansson / danielk mrl.nyu edu 
yes another 1 year old patch, this one though has one failed hunk

Originally committed as revision 7676 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-23 21:47:32 +00:00
Daniel Kristjansson
2ddb79befd "converts printf's to avlog's" patch by Daniel Kristjansson / danielk mrl.nyu edu 
another 1 year old patch forgoten by mans
trailing whitespace removial by me

Originally committed as revision 7674 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-23 21:41:30 +00:00
Måns Rullgård
1ed1a122a7 make some symbols static 
Originally committed as revision 6973 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-11 20:56:36 +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
Nico Sabbi
ec6913d267 scan s->probesize packets instead of MAX_SCAN_PACKETS (that is still the default value) 
Originally committed as revision 6110 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-27 12:22:40 +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
Nico Sabbi
2eb1a65d91 Etsi identifies DTS audio with stream_private+descriptor 0x7b (in the PMT). 
This patch permits to recognize these streams but it's untested for
lack of samples.

Patch by Nico Sabbi <nicola_sabbi at fastwebnet it>

Originally committed as revision 5671 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-08 16:25:45 +00:00
Stefan Huehner
7b49ce2e34 Add const to (mostly) char* and make some functions static, which aren't used 
outside their declaring source file and which have no corresponding prototype.
patch by Stefan Huehner stefan^^@^^huehner^^.^^org

Originally committed as revision 5497 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-06-18 11:33:14 +00:00
Måns Rullgård
9d9b432ae9 This patch simply adds demuxing support for AC-3 streams in DVB TS 
files.  In these streams AC-3 is given type 0x06 (private stream) and
includes a descriptor with either tag 0x6A or 0x7A.  The code already
handles ATSC AC-3 which uses stream type 0x81.  All the new patch does
is look for any stream type 0x06 that has a descriptor with the proper
tag (i.e. 0x6A or 0x7A) and if found forces it to be recognized as an
AC-3 stream.
From Andy Brown <abrown at daqtron com>

Originally committed as revision 5260 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-04-01 19:02:40 +00:00
Måns Rullgård
00a6b92bdd fix memory leak on mpegts close 
found by Andy Brown <abrown at daqtron com>

Originally committed as revision 5259 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-04-01 18:19:00 +00:00
Michael Niedermayer
43a80ccee5 generic crc calculation code 
Originally committed as revision 5115 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-03-06 14:13:01 +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
Nico Sabbi
27c748b576 try with auto_guess if first detection fails 
Originally committed as revision 4802 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-02 20:27:15 +00:00
Nico Sabbi
5d4d67e0ff added support for DVHS (192) packet size 
Originally committed as revision 4801 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-02 20:13:24 +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
79396ac685 Kill some compiler warnings. Compiled code verified identical after changes. 
Originally committed as revision 4567 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-09-06 21:25:35 +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
c6ec28b18c DVB subtitle decoder by (Ian Caulfield: imc25, cam ac uk) 
Originally committed as revision 4448 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-07-17 00:28:12 +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
Wolfram Gloger
415264045f Correct number of bits for PTS. 
Patch by Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>

Originally committed as revision 4188 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-06 16:14:29 +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
Wolfram Gloger
27bb1ed348 Writing to freed memory in write_section_data() patch by (Wolfram Gloger <wmglo dent dot med dot uni-muenchen de>) 
Originally committed as revision 3957 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-02-16 23:04:11 +00:00
Michael Niedermayer
3ba1438dec use native timebase for seeking 
direction flag for seeking

Originally committed as revision 3577 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-10 22:05:43 +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
Michael Niedermayer
e05655fbbd fix playback of http://www.zonque.org/test-long.ps 
better seeking, (not to keyframes but at least to the start of packets ...)

Originally committed as revision 3182 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-31 16:57: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
Michael Niedermayer
9ee91c2f53 move time_base (pts_num/pts_den) from AVFormatContext -> AVStream 
Originally committed as revision 3148 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-21 20:43:21 +00:00
Wolfram Gloger
550f0a9b07 Off-by-two in mpegts.c patch by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>) 
Originally committed as revision 3011 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-13 13:33:02 +00:00
Wolfram Gloger
6fb316d563 Support raw mpegts streams from dvr patch by (wmglo at dent dot med dot uni-muenchen dot de) 
Originally committed as revision 2931 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-26 17:40:40 +00:00
Gildas Bazin
2092bd7531 avsync patch by (Gildas Bazin <gbazin at altern dot org>) 
Originally committed as revision 2805 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-20 14:39:15 +00:00
Gildas Bazin
ec7d0d2e9e memleak patch by (Gildas Bazin <gbazin at altern dot org>) 
Originally committed as revision 2678 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-01-08 19:01:16 +00:00
Michael Niedermayer
a0b8f70c29 better get_packet_size and probe 
Originally committed as revision 2578 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-12-09 00:17:43 +00:00
Måns Rullgård
278de4755d support more codecs in MPEG-TS patch by (mru at kth dot se (Måns Rullgård)) 
Originally committed as revision 2511 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-11-12 21:56:57 +00:00
Fabrice Bellard
27f388aa24 seek support 
Originally committed as revision 2501 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-11-10 18:47:52 +00:00
Fabrice Bellard
b45a7a18d3 mpeg TS demux API (called from RTP layer) - raw mpeg TS reader (uses fake codec MPEG2TS) 
Originally committed as revision 2446 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-10-29 14:16:31 +00:00
Doug Larrick
66535069da Enable decoding of more mpeg-ts streams for pcHDTV patch by (Doug Larrick <doug at ties dot org>) 
Originally committed as revision 2390 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-10-15 18:06:44 +00:00
Mike Melanson
764ef40015 disable encoders where appropriate (patch courtesy of BERO 
<bero -at- geocities.co.jp>)

Originally committed as revision 2375 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-10-14 04:15:53 +00:00
Fabrice Bellard
fc48fe84a9 cosmetic change in resync code - added PAT scanning code if no SDT is found (in the futur it would be interesting to give an API to change channel - also useful for DV input number or TV grab tunning 
Originally committed as revision 2043 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-07-15 13:21:39 +00:00
Isaac Richards
ec23a47286 - Looks a tiny bit harder in mpegps_probe() for a valid start code. This is 
needed to detect some files produced by pvr-250/350 capture cards.
- Adds AC3 audio support to the mpegts demuxer, and makes it a little more
tolerant of bad files.
patch by (Isaac Richards <ijr at po dot cwru dot edu>)

Originally committed as revision 2028 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-07-10 09:04:04 +00:00
Michael Niedermayer
ce34182dd7 try to filter _all_ PATs if no SDT could be found patch by (<gbazin at altern dot org>) 
+ mpegtsenc.c compile fix by me

Originally committed as revision 1995 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-06-28 23:44:09 +00:00
Fabrice Bellard
5dbafeb7ba mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux 
Originally committed as revision 1956 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-06-13 14:28:45 +00:00
François Revol
6af6cf22c5 avoid detecting mpeg stream when other formats embed mp3 tracks. 
Originally committed as revision 1788 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-04-18 14:35:15 +00:00
Zdenek Kabelac
0c1a9edad4 * UINTX -> uintx_t INTX -> intx_t 
Originally committed as revision 1578 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-02-11 16:35:48 +00:00
Fabrice Bellard
abac617591 renamed libav to libavformat 
Originally committed as revision 1276 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-11-25 19:07:40 +00:00