RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-28 18:32:22 +00:00
Code Issues Projects Releases Wiki Activity
29,683 Commits 37 Branches 400 Tags 246 MiB
1795364205
Commit Graph

357 Commits

Author SHA1 Message Date
Michael Niedermayer
b000b86e1d Merge remote branch 'qatar/master' 
* qatar/master: (23 commits)
  doc: Check standalone compilation before submitting new components.
  Fix standalone compilation of pipe protocol.
  Fix standalone compilation of ac3_fixed encoder.
  Fix standalone compilation of binkaudio_dct / binkaudio_rdft decoders.
  Fix standalone compilation of IMC decoder.
  Fix standalone compilation of WTV demuxer.
  Fix standalone compilation of MXPEG decoder.
  flashsv: K&R cosmetics
  matroskaenc: fix memory leak
  vc1: make overlap filter for I-frames bit-exact.
  vc1dec: use s->start/end_mb_y instead of passing them as function args.
  Revert "VC1: merge idct8x8, coeff adjustments and put_pixels."
  Replace strncpy() with av_strlcpy().
  indeo3: Eliminate use of long.
  get_bits: make cache unsigned to eliminate undefined signed overflow.
  asfdec: fix assert failure on invalid files
  avfilter: check malloc return values.
Not pulled as reason for reindent is not pulled:  mpegvideo: reindent.
  nutenc: check malloc return values.
Not pulled due to much simpler solution in ffmpeg  *: don't av_malloc(0).
  ...

Conflicts:
	doc/developer.texi
	libavcodec/Makefile
	libavcodec/get_bits.h
	libavcodec/mpegvideo.c
	libavformat/Makefile
	libavutil/log.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-05 03:30:24 +02:00
Alex Converse
1a5e4fd8c5 Replace strncpy() with av_strlcpy(). 2011-05-03 21:20:13 -07:00
Baptiste Coudurier
c22f2527ed In mov and flv muxer, check aac bitstream validity. 2011-04-18 14:30:14 -07:00
Baptiste Coudurier
0ba8485666 In mov muxer, compute avg bitrate in esds 2011-04-16 16:19:10 -07: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
6dc7d80de7 avio: avio_ prefix for url_close_dyn_buf 2011-04-03 22:47:05 +02:00
Anton Khirnov
b92c545282 avio: avio_ prefix for url_open_dyn_buf 2011-04-03 22:46:56 +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
Baptiste Coudurier
93dfda8896 In ipod/mov/mp4 muxer, always write esds descriptor length using 4 bytes, 
ipod shuffle doesn't support anything else.
 2011-03-30 14:09:09 -07:00
Baptiste Coudurier
efdad9fbc7 In mov muxer, fix yuv range in avid atoms used by dnxhd. 2011-03-30 08:48:08 -07: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
b7f2fdde74 avio: rename put_flush_packet -> avio_flush 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 22:59:39 -04: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
Baptiste Coudurier
cd37308b77 movenc: use correct tag for dvcpro hd 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 06ed4873e6)
 2011-03-03 14:15:09 +01:00
Baptiste Coudurier
5bb50c71a3 movenc: fix tkhd height for imx 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit fffdee89cc)
 2011-03-03 14:15:09 +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
Baptiste Coudurier
06ed4873e6 movenc: use correct tag for dvcpro hd 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-02 00:23:08 +00:00
Baptiste Coudurier
fffdee89cc movenc: fix tkhd height for imx 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-01 23:45:03 +00: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
65ad2c618f In mov muxer, fix adpcm mono muxing, patch by Alex Converse 2011-02-27 16:29:21 -08:00
Ronald S. Bultje
4e815a8b60 movenc: remove uses of deprecated API. 
Replace put_tag() with ffio_wfourcc() and ByteIOContext with AVIOContext.
(cherry picked from commit 13ff92d197)
 2011-02-26 03:16:09 +01:00
Maksym Veremeyenko
aaa71a3e1d store pasp atom for all types of quicktime movie 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit d184c86cd3)
 2011-02-26 03:16:09 +01:00
Maksym Veremeyenko
eea040212c reindent after tapt patch 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 77d207cbe6)
 2011-02-26 03:16:09 +01:00
Maksym Veremeyenko
3b2c4ce140 use tapt atom for sample aspect ratio 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit ea1afa124c)
 2011-02-26 03:16:09 +01:00
Anton Khirnov
324429309e lavf: use a new ffio_wfourcc macro instead of put_tag() where possible 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 0abdb29317)
 2011-02-26 03:16:04 +01:00
Ronald S. Bultje
13ff92d197 movenc: remove uses of deprecated API. 
Replace put_tag() with ffio_wfourcc() and ByteIOContext with AVIOContext.
 2011-02-25 17:41:00 -05:00
Maksym Veremeyenko
d184c86cd3 store pasp atom for all types of quicktime movie 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-02-25 22:31:16 +01:00
Maksym Veremeyenko
77d207cbe6 reindent after tapt patch 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-02-25 22:31:16 +01:00
Maksym Veremeyenko
ea1afa124c use tapt atom for sample aspect ratio 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-02-25 22:31:16 +01:00
Anton Khirnov
0abdb29317 lavf: use a new ffio_wfourcc macro instead of put_tag() where possible 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-25 14:38:22 -05:00
Anton Khirnov
e9eb8d0bce avio: avio: avio_ prefixes for put_* functions 
In the name of consistency:
put_byte           -> avio_w8
put_<type>         -> avio_w<type>
put_buffer         -> avio_write

put_nbyte will be made private
put_tag will be merged with avio_put_str

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 77eb5504d3)
 2011-02-22 02:44:38 +01:00
Anton Khirnov
77eb5504d3 avio: avio: avio_ prefixes for put_* functions 
In the name of consistency:
put_byte           -> avio_w8
put_<type>         -> avio_w<type>
put_buffer         -> avio_write

put_nbyte will be made private
put_tag will be merged with avio_put_str

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-21 14:25:15 -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
Takashi Mochizuki
62bacc4e0c movenc: Force first sample as SYNC 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 44b1120724)
 2011-02-14 23:58:17 +01:00
Takashi Mochizuki
44b1120724 movenc: Force first sample as SYNC 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-02-13 01:16:30 +00:00
Janne Grunau
9653e754a4 movenc: byteswap codec_tag in mov_write_ms_tag 
based on Alex Converse's "Fix ADPCM MS in mov muxing" patch
(cherry picked from commit 795ed278e6)
 2011-01-28 03:15:35 +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
Janne Grunau
795ed278e6 movenc: byteswap codec_tag in mov_write_ms_tag 
based on Alex Converse's "Fix ADPCM MS in mov muxing" patch
 2011-01-28 01:06:57 +01:00
Baptiste Coudurier
f258964217 In mov muxer, mux adpcm_ms and adpcm_ima_wav the way quicktime supports it 
In mov demuxer, set adpcm_ms and adpcm_ima_wav frame size to stsd samples per packet.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-28 01:06:57 +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
Baptiste Coudurier
d4e0130e46 In mov muxer, mux adpcm_ms and adpcm_ima_wav the way quicktime supports it. 
In mov demuxer, set adpcm_ms and adpcm_ima_wav frame size to stsd samples per packet.
 2011-01-24 14:20:48 -08:00
Baptiste Coudurier
a2b7ed3274 In mov muxer, override codec tag for dv in mov, fix remuxing from avi 
Originally committed as revision 26257 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-07 19:56:31 +00:00
Baptiste Coudurier
10d8eac98d In mov muxer, override codec tag for h263 in mov, fix remuxing from 3gp 
Originally committed as revision 26255 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-07 19:55:08 +00:00
Baptiste Coudurier
91360ce61d Unset variable fps for mov and mp4 muxer, they support it 
but timestamps must start at 0 currently, and this causes sync
problem.

Originally committed as revision 25805 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-23 00:41:28 +00:00
Baptiste Coudurier
96d1e75a0c In mov muxer, write artist metadata tag 
Originally committed as revision 25498 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 23:23:47 +00:00
Baptiste Coudurier
edd33cb6fa In mov muxer, use correct metadata tag for encoder, and use the generic metadata api name 
Originally committed as revision 25497 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 23:16:11 +00:00
Baptiste Coudurier
6bd296f1e4 In mov muxer, write reduced sample aspect ratio values in pasp 
Originally committed as revision 25082 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-08 20:22:02 +00:00