1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Commit Graph

21 Commits

Author SHA1 Message Date
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
Mans Rullgard
e65ab9d94f Remove unused variables 2011-06-02 20:06:00 +01:00
Diego Biurrun
045dd4b928 Replace some commented-out debug printf() / av_log() messages with av_dlog(). 2011-04-29 17:27:01 +02:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
Diego Elio Pettenò
e7e2df27f8 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d36beb3f69)
2011-01-28 03:15:34 +01:00
Diego Elio Pettenò
d36beb3f69 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-26 16:08:45 +00:00
Michael Niedermayer
299fd39697 Revert
r12684 | michael | 2008-04-04 02:43:34 +0200 (Fri, 04 Apr 2008) | 2 lines
	Disable the split function. This should end the mpeg1/2 global header issues.
The split function is essential for -ss to work
Fixes issue1226
If this breaks something please tell me, also if someoen remembers what problem
this originally caused tell me too, i searched but couldnt find it.

Originally committed as revision 21621 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-03 04:40:42 +00:00
Michael Niedermayer
7debef33f8 Merge init & declaration of buf_end.
From ffmbc0.3

Originally committed as revision 20863 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-14 11:57:33 +00:00
Carl Eugen Hoyos
f50270c9c0 Cosmetics: Reindent after r20736.
Originally committed as revision 20737 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-05 09:36:32 +00:00
Michael Niedermayer
442d7dd852 Make sure the parsers do not overwrite width/height as this can interfere
with the decoder.
Fixes issue1135.

Originally committed as revision 20736 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-05 03:53:12 +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
edbd72acea Correct time_base and repeat_pict for MPEG2 video.
Patch by Ivan Schreter, schreter gmx net

Originally committed as revision 17572 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-24 20:23:19 +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
Michael Niedermayer
d59591fb02 In mpeg1/2 timestamps are associated with the access unit which
contains the first picture startcode that commences in the PES
packet, instead of the first access unit that commences in the
PES packet. Fix the parser to
handle that properly. This was a very long standing bug ...
The change to the seek regressions is because the mpeg ts muxer
stores too many invalid and randomized timestamps which overflow
the 4 entry buffer we use in the parser.

Originally committed as revision 13643 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-03 02:43:17 +00:00
Michael Niedermayer
39e9e6d940 Disable the split function. This should end the mpeg1/2 global header issues.
Originally committed as revision 12684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-04 00:43:34 +00:00
Michael Niedermayer
635fbcb17f revert 12156
Log:
Make timestamp interpolation work with mpeg2 field pictures.
Cleaner/simpler solutions are welcome.
----
A IMHO cleaner solution has been implemented.

Originally committed as revision 12162 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-20 20:24:38 +00:00
Michael Niedermayer
bdd745da60 Forgot this, which is needed for merging field pics too.
Originally committed as revision 12161 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-20 19:48:25 +00:00
Michael Niedermayer
ff2635b273 Make timestamp interpolation work with mpeg2 field pictures.
Cleaner/simpler solutions are welcome.

Originally committed as revision 12156 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-20 03:20:06 +00:00
Aurelien Jacobs
c53d2d9042 make some parser parameters const to avoid casting const to non-const
Originally committed as revision 8921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-07 00:47:03 +00:00
Aurelien Jacobs
95dca03f77 add a ff_ prefix to the now exported mpeg1_find_frame_end() function
Originally committed as revision 8902 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-05 18:25:02 +00:00
Aurelien Jacobs
7f50d4ac51 move mpegvideo_parser in it's own file
Originally committed as revision 8901 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-05 18:18:51 +00:00