Commit Graph

630 Commits

Author SHA1 Message Date
Michael Niedermayer
c88caa522c Merge remote branch 'qatar/master'
* qatar/master:
  proto: include os_support.h in network.h
  matroskaenc: don't write an empty Cues element.
  lavc: add a FF_API_REQUEST_CHANNELS deprecation macro
  avio: move extern url_interrupt_cb declaration from avio.h to url.h
  avio: make av_register_protocol2 internal.
  avio: avio_ prefix for url_set_interrupt_cb.
  avio: AVIO_ prefixes for URL_ open flags.
  proto: introduce listen option in tcp
  doc: clarify configure features
  proto: factor ff_network_wait_fd and use it on udp

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-08 02:50:13 +02:00
Anton Khirnov
f87b1b373a avio: AVIO_ prefixes for URL_ open flags. 2011-04-07 18:07:16 +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
19457a5d4a Fix issue2246
ignore last ctts duration
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-03 16:40:12 +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
Alex Converse
9dd94f8379 mov: Add support for zero-sized stsc runs.
A zero sized stsc run doesn't make a lot of sense but the spec does not
prohibit them and MPlayer VLC demuxers support them.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-03-31 07:28:20 +02:00
Michael Niedermayer
27ef7b1bcd Merge remote-tracking branch 'newdev/master'
* newdev/master:
  mov: set audio service type for AC-3 from bitstream mode in the 'dac3' atom.
  Get audio_service_type for AC-3 based on bitstream mode in the AC-3 parser and decoder, and vice-versa for the AC-3 encoder.
  Use audio_service_type to set stream disposition.
  Add APIchanges entry for audio_service_type.
  Add audio_service_type field to AVCodecContext for encoding and reporting of the service type in the audio bitstream.
  configure: in check_ld, place new -l flags before existing ones
  support @heading, @subheading, @subsubheading, and @subsubsection in texi2pod.pl
  doc: update build system documentation
  aacenc: indentation
  aacenc: fix the side calculation in search_for_ms
  vp8.c: rename EDGE_* to VP8_EDGE_*.

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/version.h
	libavcodec/vp8.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-26 03:06:30 +01:00
Justin Ruggles
eb81cf860c mov: set audio service type for AC-3 from bitstream mode in the 'dac3' atom. 2011-03-25 16:59:09 -04: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
db44ea960d avio: avio_ prefix for url_fsize
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 76aa876e69)
2011-03-08 02:09:21 +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
Anton Khirnov
76aa876e69 avio: avio_ prefix for url_fsize
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-07 11:03:39 -05:00
Michael Niedermayer
4118d66cb3 Revert "lavf: deprecate get_strz() in favor of avio_get_str"
This API is simply ridiculous.
We of course keep API/ABI compatibility only useage of the worse API
is reverted.

This reverts commit 773947ba76.
2011-03-06 02:16:00 +01: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
773947ba76 lavf: deprecate get_strz() in favor of avio_get_str
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e16ead0716)
2011-03-05 02:29:28 +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
e16ead0716 lavf: deprecate get_strz() in favor of avio_get_str
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-04 11:26:02 -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
ebb92e0768 avio: rename url_fopen/fclose -> avio_open/close.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 22a3212e32)
2011-02-23 18:22:03 +01:00
Anton Khirnov
22a3212e32 avio: rename url_fopen/fclose -> avio_open/close.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-23 10:18:55 -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
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
Mans Rullgard
5e81cb580a mov: remove stray semicolon
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 628b16f45f)
2011-02-11 02:54:09 +01:00
Mans Rullgard
628b16f45f mov: remove stray semicolon
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-10 14:17:24 +00:00
Sascha Sommer
e11afd71a3 pass QDMC extradata to the decoder
Makes playing QDMC files in MPlayer work when using the libavformat demuxer.
Problem was that the extradata was not passed from demuxer to decoder.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ed19fafd48)
2011-02-09 03:30:01 +01:00
Sascha Sommer
ed19fafd48 pass QDMC extradata to the decoder
Makes playing QDMC files in MPlayer work when using the libavformat demuxer.
Problem was that the extradata was not passed from demuxer to decoder.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-06 16:05:55 -05: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
John Stebbins
2f7d8977bc mov: add support for little-endian utf16 chapter names
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 97b04f5ed3)
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
Anton Khirnov
ebf3ee16c7 mov: simplify mov_read_chapters() by using avio_get_str16be
It probably also fixes a memleak or two.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 225b6d7fde)
2011-01-28 03:15:34 +01:00
Mans Rullgard
bc1aebcd07 Revert "mov: simplify mov_read_chapters() by using avio_get_str16be"
This reverts commit c34461b35b.
The wrong version of the patch was committed.
(cherry picked from commit c4f8765ac5)
2011-01-28 03:15:34 +01:00
John Stebbins
97b04f5ed3 mov: add support for little-endian utf16 chapter names
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
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
Anton Khirnov
225b6d7fde mov: simplify mov_read_chapters() by using avio_get_str16be
It probably also fixes a memleak or two.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-26 22:03:21 +00:00
Mans Rullgard
c4f8765ac5 Revert "mov: simplify mov_read_chapters() by using avio_get_str16be"
This reverts commit c34461b35b.
The wrong version of the patch was committed.
2011-01-26 22:03:21 +00:00
Anton Khirnov
0c468f5684 mov: simplify mov_read_chapters() by using avio_get_str16be
It probably also fixes a memleak or two.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit c34461b35b)
2011-01-26 03:43:31 +01:00
Anton Khirnov
c34461b35b mov: simplify mov_read_chapters() by using avio_get_str16be
It probably also fixes a memleak or two.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-25 21:48:03 +01: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
c3024f9e7e In mov demuxer, handle better wrong time scale, fix issue #2528
Originally committed as revision 26311 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-11 21:06:37 +00:00
Baptiste Coudurier
f6253caf8b In mov demuxer, set r_frame_rate for cfr files
Originally committed as revision 26310 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-11 19:58:00 +00:00
Baptiste Coudurier
5e2202d6f3 In mov demuxer, check that gmtime returns a valid value, fix crash, issue #2490
Originally committed as revision 26228 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-05 19:21:04 +00:00
Baptiste Coudurier
4af7166fb4 In mov demuxer, check that stts data exists, fix crash, issue #2479
Originally committed as revision 26227 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-05 19:14:44 +00:00
Baptiste Coudurier
c6f1e29a15 In mov demuxer, read alac sample from extradata, fix #2406
Originally committed as revision 25901 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-07 01:38:26 +00:00
Baptiste Coudurier
adc7305424 In mov demuxer, if multiple h264 stsd are present, do not concatenate streams, fix #2069
Originally committed as revision 25825 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-25 05:03:29 +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
Aurelien Jacobs
7df2214328 movdec: export creation_date as metadata
Originally committed as revision 25786 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-21 19:02:52 +00:00
Baptiste Coudurier
2b91d83ef3 In mov demuxer, export .mov encoder metadata tag
Originally committed as revision 25757 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-16 05:55:09 +00:00
Martin Storsjö
2f412421e8 movdec: Free the previous extradata
If multiple stsd atoms are parsed for the same stream, the old
extradata would be leaked.

Originally committed as revision 25360 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-05 21:36:30 +00:00
Martin Storsjö
dc2cabd003 movdec: Split out ff_mov_read_stsd
Originally committed as revision 25359 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-05 21:35:44 +00:00
Baptiste Coudurier
6d19fd5c26 In mov demuxer, check that nb_streams is valid before using it in read_dac3
Originally committed as revision 25240 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-28 00:33:21 +00:00
Baptiste Coudurier
0e7d436d92 Check dref size based on a patch by google
Originally committed as revision 25081 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-08 20:20:24 +00:00
Baptiste Coudurier
9044dd8399 In mov demuxer, do not override aspect ratio in tkhd by pasp like quicktime, fix issue #1539
Originally committed as revision 25080 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-08 20:18:14 +00:00
Justin Ruggles
bdecdd2bfc Read the number of channels from the 'dac3' tag for AC-3 in MP4.
Originally committed as revision 25054 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-06 21:52:11 +00:00
Måns Rullgård
8fc0162ac4 Add av_ prefix to bswap macros
Originally committed as revision 24170 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-10 22:12:30 +00:00
David Conrad
105b37859b mov: Read Flash's chpl variant
This is based off of F4V specs rather than any actual files

Originally committed as revision 24035 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-04 04:59:12 +00:00
John Stebbins
380966a801 In mov demuxer, fix seeking to the beginning when file has edit lists.
Patch by John Stebbins, stebbins at jetheaddev dot com
Fixes issue #2046

Originally committed as revision 23966 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 08:24:37 +00:00
Andrew Wason
525fcb2798 In mov demuxer, only set sar if not already set, patch by Andrew Wason,
rectalogic at rectalogic dot com
Fixes issue #1754

Originally committed as revision 23948 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-01 23:18:27 +00:00
Baptiste Coudurier
7d6096e42e Use ext sample from mpeg4audio config if set with AAC SBR
Originally committed as revision 23947 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-01 22:31:31 +00:00
Baptiste Coudurier
2209ffacb9 In mov demuxer, increase total size after debugging message
Originally committed as revision 23864 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-28 21:02:16 +00:00
Baptiste Coudurier
3491866a4b Improve mov atom parsing debug message, print parent atom and size in decimal
Originally committed as revision 23764 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-25 01:19:03 +00:00
Baptiste Coudurier
ea4c4d7fe3 change author metadata to artist in mov de/muxer
Originally committed as revision 23266 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 21:03:14 +00:00
David Conrad
1cf9f6ed4f mov: Read nero chapters
Originally committed as revision 23020 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-05 08:41:01 +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
David Conrad
7221579b0c mov: Read QuickTime chapters
Originally committed as revision 22928 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-21 06:36:09 +00:00
Martin Storsjö
653d7aeb61 Parse strf mov atoms
This fixes roundup issue 1270.

Originally committed as revision 22894 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-16 20:36:24 +00:00
Jean-Daniel Dupas
cc947f04cc Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.
Patch by Jean-Daniel Dupas, devlists shadowlab org

Originally committed as revision 22744 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-31 12:29:58 +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
Baptiste Coudurier
08a186c648 In mov demuxer, convert mac encoded strings to utf-8
Originally committed as revision 22365 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 01:03:42 +00:00
Baptiste Coudurier
987e857f63 Preallocate index entries in mov demuxer, huge speedup
Originally committed as revision 22363 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 00:46:26 +00:00
Carl Eugen Hoyos
998257bd4f Make mp4_read_descr static: It is only used inside libavformat/mov.c.
Originally committed as revision 22097 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-28 01:51:13 +00:00
Michael Niedermayer
bbdf0d2214 Make sure we dont write more bytes into filename than the array is long.
just a precaution in case the size of the source array is increased or
made dynamically allocateable.

Originally committed as revision 21926 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-20 22:57:23 +00:00
Michael Niedermayer
6a2459059e Do not attempt to open references through absolute pathes.
This would allow an attacker to test remotely if a local file exists.

Originally committed as revision 21925 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-20 22:48:09 +00:00
Anton Khirnov
ca76a11948 Add a list of generic tags and change demuxers to follow it.
Patch by Anton Khirnov, wyskas at gmail dot com

Originally committed as revision 21587 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-01 11:39:10 +00:00
Carl Eugen Hoyos
895a9be60c Force codec_tag I420 for Quicktime Planar Y'CbCr 8-bit 4:2:0 raw codec,
because YV12 triggers an UV swap in rawdec.c, fixes issue 1687.

Originally committed as revision 21436 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-24 21:37:35 +00:00
Baptiste Coudurier
49c43fc278 reindent
Originally committed as revision 21311 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-18 23:58:10 +00:00
Baptiste Coudurier
c3aeaa540d set average frame rate in mov demuxer
Originally committed as revision 21310 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-18 23:56:04 +00:00
Baptiste Coudurier
c956611527 move aspect ratio code at the end of the track parsing, fix cathedral-beta2-400extra-crop-avc.mp4
Originally committed as revision 21301 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-18 21:38:39 +00:00
Andrew Wason
ff5ab5c8c9 set stream aspect from mov tkhd width/height, patch by Andrew Wason, rectalogic at rectalogic dot com
Fixes issue 671.

Originally committed as revision 21210 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-14 00:32:36 +00:00
Baptiste Coudurier
49544546b0 do not skip mdat data if it's the last atom, avoids one seek
Originally committed as revision 21209 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-13 23:33:29 +00:00
Baptiste Coudurier
7b1312fa55 cosmetics, remove useless parentheses, add space
Originally committed as revision 21025 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-04 22:59:43 +00:00
Baptiste Coudurier
a510991cff simplify error handling in mov_read_default
Originally committed as revision 21024 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-04 22:58:19 +00:00
Baptiste Coudurier
cb41b2b6e0 remove no more needed MOVAtom.offset field
Originally committed as revision 21023 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-04 22:51:38 +00:00
Baptiste Coudurier
7ead7e2181 remove useless code skipping data at end of hdlr atom, already done in mov_read_default
Originally committed as revision 21022 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-04 22:48:27 +00:00
Jai Menon
6866dd1237 Fix typo.
Originally committed as revision 20628 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-27 13:10:56 +00:00
David Conrad
b9c78bca26 MOV: cprt is another tag used for copyright
Originally committed as revision 20587 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-23 08:47:47 +00:00
David Conrad
7382902b86 MOV: Add several iTunes metadata tags
Originally committed as revision 20586 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-23 08:47:44 +00:00
Baptiste Coudurier
e26df9ebf1 use AVFormatContext in dprintf
Originally committed as revision 20554 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-19 21:03:25 +00:00
Baptiste Coudurier
adeb907137 Search relative path according to alias record when opening mov reference files.
Based on patch by Maksym Veremeyenko, verem at m1stereo dot tv

Originally committed as revision 20539 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-15 03:26:47 +00:00