Commit Graph

123 Commits

Author SHA1 Message Date
Maksym Veremeyenko
94bf9ac473 fix av_dlog call with non-AVClass struct
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-16 20:32:16 +01:00
Michael Niedermayer
8bc7fe4daf Merge remote-tracking branch 'qatar/master'
* qatar/master:
  doxygen: misc consistency, spelling and wording fixes
  vcr1: drop unnecessary emms_c() calls without MMX code
  Replace all uses of av_close_input_file() with avformat_close_input().
  lavf: add avformat_close_input().
  lavf: deprecate av_close_input_stream().
  lavf doxy: add some basic demuxing documentation.
  lavf doxy: add some general lavf information.
  lavf doxy: add misc utility functions to a group.
  lavf doxy: add av_guess_codec/format to the encoding group.
  lavf doxy: add core functions to a doxy group.
  Add basic libavdevice documentation.
  lavc: convert error_recognition to err_recognition.
  avconv: update -map option help text
  x86: Require 7 registers for the cabac asm
  x86: bswap: remove test for bswap instruction
  bswap: make generic implementation more compiler-friendly
  h264: remove useless cast
  proresdec: fix decode_slice() prototype

Conflicts:
	configure
	doc/APIchanges
	ffprobe.c
	libavcodec/avcodec.h
	libavcodec/celp_math.h
	libavcodec/h264.c
	libavfilter/src_movie.c
	libavformat/anm.c
	libavformat/avformat.h
	libavformat/version.h
	libavutil/avstring.h
	libavutil/bswap.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-13 00:39:48 +01:00
Diego Biurrun
58c42af722 doxygen: misc consistency, spelling and wording fixes 2011-12-12 23:06:23 +01:00
Diego Biurrun
aebb56e184 Replace some commented-out debug printf() / av_log() messages with av_dlog().
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-01 01:31:03 +02:00
Stefano Sabatini
ce5e49b0c2 replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_* 2011-05-02 16:41:41 +02:00
Stefano Sabatini
975a1447f7 Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-05-02 12:18:44 +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
09cbf60f8e Replace more disabled printf() calls by av_dlog(). 2011-04-29 20:00:41 +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
85ff339489 Revert "avparser: don't av_malloc(0)."
This hack is no longer needed.

This reverts commit 191e08d113.
2011-04-29 02:17:38 +02:00
Ronald S. Bultje
5eef4afb9a avparser: don't av_malloc(0).
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-04-26 22:07:17 -07:00
Ronald S. Bultje
191e08d113 avparser: don't av_malloc(0).
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-27 04:20:55 +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
3453a231a6 lavc: remove misc disabled cruft. 2011-04-19 19:01:22 +02:00
Michael Niedermayer
c0e51ec9c6 Merge remote branch 'qatar/master'
* qatar/master:
  Fix parser: mark av_parser_parse() for removal on next major bump
  swscale: postpone sws_getContext removal until next major bump.
  fate: add AAC LATM test
  mmst: get rid of deprecated AVERRORs
  lxfdec: use AVERROR(ENOMEM) instead of deprecated AVERROR_NOMEM.
  Reemove remaining uses of deprecated AVERROR_NOTSUPP.
REIMPLEMENTED in 2 lines of code:  lavf: if id3v2 tag is present and all else fails, guess by file extension

Conflicts:
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-07 03:32:26 +02:00
Brad
1f6265e011 Fix parser: mark av_parser_parse() for removal on next major bump
Fix the breakage introduced with 9073ca6c6e
2011-04-06 23:45:34 +02:00
Michael Niedermayer
f35439699f Merge remote branch 'qatar/master'
* qatar/master:
  Fixed-point MDCT with 32-bit unscaled output
  lavc: deprecate rate_emu
  lavc: mark hurry_up for removal on next major bump
  parser: mark av_parser_parse() for removal on next major bump
  lavc: add missing audioconvert includes
  jvdec: don't use deprecated CODEC_TYPE_*/PKT_FLAG_KEY

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-03 02:28:01 +02:00
Anton Khirnov
9073ca6c6e parser: mark av_parser_parse() for removal on next major bump
Fixes build with the bump, since the prototype is already marked for
removal.
2011-04-02 16:17:15 +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 Chinen
59cb40b921 Fix index_entries pos:
It was being set wrong for files with data_offset > 0

Patch by Michael Chinen, mchinen gmail

Originally committed as revision 25239 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-27 22:17:58 +00:00
Aurelien Jacobs
c01694c889 saner default value for convergence_duration
Originally committed as revision 24002 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 15:57:56 +00:00
Jai Menon
6858ce2ffc Fix typo.
Originally committed as revision 22936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-21 17:51:37 +00:00
Benoit Fouet
32e543f866 Replace @returns by @return.
Originally committed as revision 22729 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 15:50:57 +00:00
Baptiste Coudurier
b27758bc02 Fetch timestamp for the first frame of field only if frame_offset and
next_frame_offset are not set, because second field has next frame offset set
but not frame_offset, otherwise this wrongly fetch timestamp for the
second field.

Originally committed as revision 19244 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-21 03:50:26 +00:00
Baptiste Coudurier
6645e8ca2f do not reference remainder packets in the parser, fix timestamps fetching
Originally committed as revision 18958 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-26 23:58:30 +00:00
Ivan Schreter
b283ba26ce Add handling of frame position in the parser.
Originally committed as revision 17823 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-05 07:35:06 +00:00
Michael Niedermayer
7115cbda30 Consider all packets in the parser, not just ones with timestamps,
this should greatly simplify handling of packet pos.

Originally committed as revision 17733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-02 15:13:58 +00:00
Michael Niedermayer
2cc304215d Favor container packets that end after the first byte of the access
unit in fetch_timestamp(). This should make no difference for valid
streams but may help invalid ones, also its needed for future changes.

Originally committed as revision 17732 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-02 15:12:26 +00:00
Michael Niedermayer
a4c7a5ea27 Call ff_fetch_timestamp() for mpeg1/2 when a picture start code is found instead
of calling it at the end of a frame with a large negative offset.
This significantly reduces the maximal distance in container packets between
the point where the first byte of the "access unit" was stored and where
we call ff_fetch_timestamp() thus reducing the constraints on our parser.
Also change the parser from next_frame_offset to cur, this is needed
because now the reference is from container packet start instead of
frame start. (i previously misinterpreted this as bug)

Originally committed as revision 17731 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-02 14:53:18 +00:00
Ivan Schreter
27ca0a79c9 Add timestamp computation if values are exported by decoder.
Patch by Ivan Schreter, schreter gmx net

Originally committed as revision 17574 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-24 22:19:09 +00:00
Ivan Schreter
b1fa494205 Add convergence_duration to AVCodecParserContext.
Patch by Ivan Schreter, schreter gmx net

Originally committed as revision 17468 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-19 23:35:59 +00:00
Ivan Schreter
6363af44da Add key_frame to AVCodecParserContext, used in libavformat.
Initialized to -1 in parser.c for backward compatibility.

Patch by Ivan Schreter, schreter gmx net

Originally committed as revision 17442 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-18 23:46:05 +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
Baptiste Coudurier
98a8ce4964 add state64 field to ParseContext storing last 8 bytes, to be able to check for longer startcodes
Originally committed as revision 15671 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-23 17:12:41 +00:00
Michael Niedermayer
c8714ea1b3 Use av_freep() in ff_parse_close().
Originally committed as revision 15654 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-20 09:02:55 +00:00
Diego Pettenò
e6df765ed3 Mark list heads static. Patch by Diego Pettenò
Originally committed as revision 15548 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 09:29:31 +00:00
Michael Niedermayer
44b79c6022 indent
Originally committed as revision 13628 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-02 14:54:19 +00:00
Michael Niedermayer
e4e3230ea5 Only store timestamps when there are timestamps.
Originally committed as revision 13627 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-02 14:53:54 +00:00
Michael Niedermayer
05d1d160bc Our MPEG-TS demuxer does not send complete PES packets but sends them
piecewise, thus the end values cannot be used for associating timestamps.

Originally committed as revision 13626 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-02 14:40:27 +00:00
Michael Niedermayer
ebdd73778c cosmetic
Originally committed as revision 13624 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-02 13:14:01 +00:00
Michael Niedermayer
ec0c5d482e Allow matching timestamps to be removed by fetch_timestamp().
Originally committed as revision 13623 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-02 13:12:54 +00:00
Michael Niedermayer
21e305891c Add off argument so that fetch_timestamp can search for timestamps
not associated with the first byte of access units.

Originally committed as revision 13622 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-02 13:09:56 +00:00
Michael Niedermayer
cd6144948a Factorize fetch_timestamp() into its own function
Originally committed as revision 13621 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-02 13:05:38 +00:00
Michael Niedermayer
4791778579 unused variable
Originally committed as revision 13620 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-02 13:01:23 +00:00
Michael Niedermayer
591569b596 indent
Originally committed as revision 13616 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-02 03:10:40 +00:00
Michael Niedermayer
26f237254d Rename last_frame_offset to next_frame_offset.
(it was and is the next not the last)

Originally committed as revision 13615 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-02 03:10:00 +00:00
Michael Niedermayer
cb63a4b37c Simplify parser core.
Originally committed as revision 13613 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-02 02:55:30 +00:00
Michael Niedermayer
87b6ea8458 indent
Originally committed as revision 13411 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 02:00:18 +00:00
Michael Niedermayer
99c1c3887d allow av_parser_close(NULL)
fixes issue300

Originally committed as revision 13410 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 01:58:47 +00:00
Andy Gocke
1f96bafb27 Return an error when realloc fails.
Patch by Andy Gocke (agocke gmail com)

Originally committed as revision 12581 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-25 14:48:18 +00:00