Commit Graph

543 Commits

Author SHA1 Message Date
Tomas Härdin
6b174197b5 Predicting the size of the hdlr, string data and trkn tags in the MOV muxer
Originally committed as revision 22846 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-12 07:24:30 +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
fe3ab8adfa Fix encoder metadata string langcode in mov muxer
Originally committed as revision 22369 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 01:53:16 +00:00
Baptiste Coudurier
cc255afeb5 Correctly mark mov metadata as utf-8, using iso language code
Originally committed as revision 22368 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 01:21: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
Stefano Sabatini
ade5b91dda Use av_match_ext() rather than the deprecated match_ext(), fix
warnings.

Originally committed as revision 21263 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-17 15:57:51 +00:00
Mike Melanson
2cf9c7ef9c Add support for these widely-used iTunes metadata fields: Album Artist,
Grouping, and Lyrics.

Originally committed as revision 21010 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-04 02:52:40 +00:00
Baptiste Coudurier
1bd26e51f3 100l, max value for timescale is UINT16_MAX
Originally committed as revision 20661 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-29 18:26:51 +00:00
Baptiste Coudurier
729ef3ba62 remove useless mov timescale field
Originally committed as revision 20652 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-29 02:46:49 +00:00
Baptiste Coudurier
74ccc66099 change track timescale to unsigned int, fix warning
Originally committed as revision 20651 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-29 02:41:48 +00:00
Baptiste Coudurier
7506e117db track time can be 64bit
Originally committed as revision 20650 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-29 02:40:27 +00:00
Baptiste Coudurier
7c4b7d0f41 support pcm_f32/64le in mov
Originally committed as revision 20649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-29 02:27:08 +00:00
Baptiste Coudurier
ba7c0ece61 cosmetics, reindent after last commit
Originally committed as revision 20648 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-29 02:04:44 +00:00
Baptiste Coudurier
feaa8d110d support sample rates > INT16_MAX in mov using stsd v2
Originally committed as revision 20647 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-29 02:03:24 +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
David Conrad
620af1a17a MOV: Fix writing \251wrt metadata (r20453 only fixed the demuxer)
Originally committed as revision 20585 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-23 08:47:40 +00:00
Justin Ruggles
aca857ecd3 Do not write an extra byte in the iTunes 'hdlr' tag. The files on iTMS have an
extra byte and are not compliant with ISO 14496-12.  This causes some strict
demuxers (notably the MPEG-4 ALS reference software) to fail.  It has been
confirmed that not writing the extra byte will still allow the generated MP4
files to work with QuickTime/iTunes/iPod.

Originally committed as revision 20571 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-22 02:07:10 +00:00
Daniel Verkamp
1a40491ef2 Add ff_ prefixes to exported symbols in libavformat/riff.h.
patch by Daniel Verkamp, aniel drv nu

Originally committed as revision 19254 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-22 23:09:34 +00:00
Larbi Joubala
15c315b7f1 fix 3gp metadata, write strings in UTF8, patch by Larbi Joubala, larbi dot joubala at resonate-mp4 dot com
Originally committed as revision 19023 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 05:24:16 +00:00
Larbi Joubala
606d48cee1 fix hdlr descr in mp4 which use c string, patch by Larbi Joubala, larbi dot joubala at resonate-mp4 dot com
Originally committed as revision 18911 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-23 07:17:17 +00:00
Baptiste Coudurier
e1316b19ea write 'stps' for mpeg-2 open gop in .mov
Originally committed as revision 18838 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-15 06:11:53 +00:00
Baptiste Coudurier
ab4752e382 use flags field and remove key_frame field
Originally committed as revision 18831 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-14 21:05:52 +00:00
Baptiste Coudurier
fe335ff530 change cts type to int, save some space
Originally committed as revision 18830 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-14 20:54:19 +00:00
Baptiste Coudurier
3a86d3f646 factorize av_set_pts_info
Originally committed as revision 18808 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-13 04:22:53 +00:00
Baptiste Coudurier
1fbbedff85 cosmetics, alignment
Originally committed as revision 18807 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-13 04:20:23 +00:00
Baptiste Coudurier
f65aad9587 rgb555le, rgb565le, rgb565be, bgr24 in .mov muxing
Originally committed as revision 18790 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-10 20:41:01 +00:00
Baptiste Coudurier
5b50b8f57f bgra in .mov muxing
Originally committed as revision 18789 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-10 20:14:42 +00:00
Baptiste Coudurier
dfb0471fce correct pixfmt for argb
Originally committed as revision 18788 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-10 20:12:36 +00:00
Baptiste Coudurier
ed88074a32 rgba in .mov muxing
Originally committed as revision 18787 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-10 20:11:11 +00:00
Stefano Sabatini
9106a698e7 Rename bitstream.h to get_bits.h.
Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-13 16:20:26 +00:00
Stefano Sabatini
b275500706 Split bitstream.h, put the bitstream writer stuff in the new file
put_bits.h.

Originally committed as revision 18461 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-12 08:35:26 +00:00
Baptiste Coudurier
3c8d144789 move codec tag tables near corresponding code
Originally committed as revision 18370 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 22:34:05 +00:00
Baptiste Coudurier
08680ab8c2 cosmetics, reindent
Originally committed as revision 18369 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 22:31:53 +00:00
Baptiste Coudurier
0872acc45c cosmetics, add empty line and remove useless braces
Originally committed as revision 18368 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 22:31:17 +00:00
Baptiste Coudurier
b6cb99469f fix compilation, add missing parenthesis
Originally committed as revision 18367 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 22:28:39 +00:00
Baptiste Coudurier
130ba4b17a comment the ipod subtitle check
Originally committed as revision 18366 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 22:26:47 +00:00
Baptiste Coudurier
6452af7a33 invert condition to simplify code
Originally committed as revision 18365 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 22:25:11 +00:00
Baptiste Coudurier
cf9ce6a3d6 remove no more needed code, tag is set by default
Originally committed as revision 18364 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 22:23:15 +00:00
Baptiste Coudurier
2ab57c0443 cosmetics, reindent, add empty lines
Originally committed as revision 18363 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 22:21:43 +00:00
Baptiste Coudurier
6b60028595 split mov_find_codec_tag in separate per format functions
Originally committed as revision 18362 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 22:19:58 +00:00
Baptiste Coudurier
2fa6bc789f set bits_per_coded_sample for rawvideo
Originally committed as revision 18356 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 20:47:56 +00:00
Baptiste Coudurier
50d2d05d34 override mov fourcc for pcm audio, this is safer when stream copying
Originally committed as revision 18355 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 20:37:30 +00:00
Baptiste Coudurier
5c5776e10d allocate tracks instead of using MAX_STREAMS
Originally committed as revision 18140 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-22 03:52:55 +00:00
Baptiste Coudurier
7c4502c8c4 typo in the mail, the 4am commit is always the worst
Originally committed as revision 17981 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 10:53:12 +00:00
Baptiste Coudurier
4909e517fd cosmetics
Originally committed as revision 17980 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 10:49:52 +00:00
Baptiste Coudurier
983bdd3788 add my copyright in mov de/muxer
Originally committed as revision 17979 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 10:49:28 +00:00
Baptiste Coudurier
d168b3fd2d reindent
Originally committed as revision 17940 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 08:05:18 +00:00
Baptiste Coudurier
7943a90a0d keep original tag when stream copying subs with ipod format
Originally committed as revision 17939 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 08:04:44 +00:00
Baptiste Coudurier
c569bd0632 ipod supports both subs tags
Originally committed as revision 17938 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 08:03:42 +00:00
Baptiste Coudurier
80357cfcfb reindent
Originally committed as revision 17937 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 08:02:59 +00:00
Baptiste Coudurier
9f52055463 write correct atoms based on tag and not format, fixes subs stream copy
Originally committed as revision 17936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 08:01:39 +00:00
Baptiste Coudurier
d1df4da00b use correct codec tag list for ipod format
Originally committed as revision 17935 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 07:59:38 +00:00
Baptiste Coudurier
a2523ce2e2 fix subs track height, set track->height to codec height if not set
Originally committed as revision 17929 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 06:04:56 +00:00
Ronald S. Bultje
2d243fb3fc Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
in mov.c for the demuxer. See "[PATCH] rename movenc.c MOVContext to
MOVMuxContext" thread on the mailinglist.

Originally committed as revision 17659 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-28 16:02:29 +00:00
Aurelien Jacobs
d9fc9ff31b movenc: add muxing of language along with metadata tags when available
Originally committed as revision 17612 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 13:13:48 +00:00
Aurelien Jacobs
2904fd398f return -1 for errors in ff_mov_iso639_to_lang() to allow for error checking
Originally committed as revision 17611 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 13:11:18 +00:00
Aurelien Jacobs
b97fb809b8 cosmetics: indentation
Originally committed as revision 17610 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 13:08:22 +00:00
Aurelien Jacobs
1ee2d44805 use new metadata API in mov muxer
Originally committed as revision 17609 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 13:06:49 +00:00
Michael Niedermayer
2591821213 Add AVFMT_VARIABLE_FPS to specify which muxers do not need duplicated frames.
Originally committed as revision 17554 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-24 15:04:18 +00:00
Baptiste Coudurier
6a460c36b6 write active picture height for d-10/imx in mov
Originally committed as revision 17178 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-12 09:15:36 +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
5d2160a0dd move actual writing before so new size can be taken into account
Originally committed as revision 16623 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-16 01:12:32 +00:00
Luca Abeni
ca93bc175a Reindent after last commit
Originally committed as revision 16617 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-15 14:07:59 +00:00
Luca Abeni
0a63a676ec Do not reallocate AVPacket's data when muxing a packet
Originally committed as revision 16616 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-15 14:03:07 +00:00
Aurelien Jacobs
b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*.
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-13 23:44:16 +00:00
Baptiste Coudurier
87609b51da cosmetics
Originally committed as revision 16535 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 10:42:24 +00:00
Baptiste Coudurier
985688b8e5 remove warnings about uninitialized vars
Originally committed as revision 16534 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 10:41:43 +00:00
Baptiste Coudurier
3d1b0fcd59 cosmetics
Originally committed as revision 16532 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 10:36:19 +00:00
David Conrad
f620488654 Add support for muxing mov/mp4/3gp timed text streams
Originally committed as revision 16531 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 10:26:44 +00:00
Baptiste Coudurier
c3e92a6cb4 remove _t in typedef for POSIX compatibility
Originally committed as revision 16063 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-11 20:06:56 +00:00
Diego Biurrun
bc5c918ea8 Remove offset_t typedef and use int64_t directly instead.
The name offset_t is easily confused with the standard off_t type and
*_t is POSIX reserved namespace if any POSIX header is included.

Originally committed as revision 15533 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-03 10:16:29 +00:00
Baptiste Coudurier
bed4fc54c9 write copyright metadata tag
Originally committed as revision 15276 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-08 19:11:53 +00:00
Luca Abeni
dd1c8f3e6e Bump Major version, this commit is almost just renaming bits_per_sample to
bits_per_coded_sample but that cannot be done seperately.
Patch by Luca Abeni
Also reset the minor version and fix the forgotton change to libfaad.
Note: The API/ABI should not be considered stable yet, there still may
be a change done here or there if some developer has some cleanup ideas and
patches!

Originally committed as revision 15262 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-08 14:24:59 +00:00
Baptiste Coudurier
1993f8d640 terminate tag tables by CODEC_ID_NONE
Originally committed as revision 15259 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-08 00:58:24 +00:00
Baptiste Coudurier
cf74dd4a5c do not fail if audio is uncompressed and frame size is not set, just set it
Originally committed as revision 15216 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-05 02:30:27 +00:00
Baptiste Coudurier
efa1fb39d2 cosmetics, remove whitespace
Originally committed as revision 15198 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 18:26:31 +00:00
Kurtnoise
4ed1942008 actually write dac3 atom, patch by Kurtnoise, kurtnoise at free dot fr
Originally committed as revision 15197 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 18:25:55 +00:00
Damiano Galassi
544a0f47af skip 2 bytes more when parsing ac3 frame, syncword 16bits + crc 16bits,
patch by Damiano Galassi, damiog at gmail dot com

Originally committed as revision 15196 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 18:17:21 +00:00
Baptiste Coudurier
c4e02d702c change the logic to mux 13818-3 and 11172-3 in mp4, less code
Originally committed as revision 15190 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 19:42:09 +00:00
Baptiste Coudurier
e00c3de821 forbid mp3 < 16000hz in anything except mov
Originally committed as revision 15189 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 19:31:03 +00:00
Baptiste Coudurier
c3b1325158 dirac muxing support in mp4/mov
Originally committed as revision 15188 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 19:23:24 +00:00
Baptiste Coudurier
baa0be4cf0 cosmetics, vertical align
Originally committed as revision 15185 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 19:08:56 +00:00
Baptiste Coudurier
d4a240cbc9 ac3 muxing support in mov/mp4/m4v
Originally committed as revision 15184 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 19:05:22 +00:00
Baptiste Coudurier
dfce888f8a correctly mux mpeg2 audio 13818-3 in mp4
Originally committed as revision 15156 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-02 20:48:45 +00:00
Baptiste Coudurier
e8c4df40e3 check for malloc failure
Originally committed as revision 15132 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 20:21:00 +00:00
Baptiste Coudurier
db568c079a copy whole frame in vosData for dnxhd, this code will be used for other codecs too
Originally committed as revision 15131 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 20:20:12 +00:00
Reimar Döffinger
c18545929e Change codec_tag type from const struct AVCodecTag ** to const struct AVCodecTag * const *
Originally committed as revision 14947 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 16:51:50 +00:00
Aurelien Jacobs
5972945197 convert every muxer/demuxer to write/read sample_aspect_ratio from/to
the corresponding AVStream instead of AVCodecContext

Originally committed as revision 14933 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 23:43:20 +00:00
Baptiste Coudurier
bc4c3a55f5 clarify error message about codec tag
Originally committed as revision 14013 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-27 21:29:11 +00:00
Baptiste Coudurier
40f8675ccf set correct ftyp minor version for 3gp/2
Originally committed as revision 13774 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-15 01:38:38 +00:00
Baptiste Coudurier
6ba9ed9557 invert mode_mov condition
Originally committed as revision 13773 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-14 21:12:51 +00:00
Baptiste Coudurier
d3e4783212 simplify
Originally committed as revision 13772 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-14 21:11:16 +00:00
Baptiste Coudurier
3473ca9a25 change 3gp/3g2 brands if h264 is present
Originally committed as revision 13771 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-14 21:10:11 +00:00
Baptiste Coudurier
cd70d17f5f simplify ipod brand selection
Originally committed as revision 13770 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-14 21:07:59 +00:00
Baptiste Coudurier
7b0fb8b77a fix warning, write_ftyp return int now
Originally committed as revision 13769 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-14 21:06:10 +00:00
Baptiste Coudurier
835790846c put avc1 brand in compat list when h264 is present
Originally committed as revision 13768 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-14 21:05:28 +00:00
Michael Niedermayer
65f526835f I think we are also compliant to iso2.
Originally committed as revision 13765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-13 13:52:53 +00:00
Michael Niedermayer
ed6e47c21d Add isom to the compatible brands.
Originally committed as revision 13764 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-13 12:19:01 +00:00
Michael Niedermayer
1560b66714 Calculate ftyp size instead of hardcoding it.
Originally committed as revision 13763 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-13 11:30:36 +00:00
Michael Niedermayer
a04aec6d1a simplify MODE_3G2
Originally committed as revision 13755 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-12 03:08:41 +00:00
Michael Niedermayer
2c77994fc8 Change MODE_* to 1<<c so several can be set at the same time.
Originally committed as revision 13754 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-12 03:08:08 +00:00
Baptiste Coudurier
ce072b2d30 cosmetics, reindent
Originally committed as revision 13752 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-12 00:56:54 +00:00
Baptiste Coudurier
283c9a8ed4 don't write double sets of metadata in mov, only write usual ones
Originally committed as revision 13751 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-12 00:55:49 +00:00
Baptiste Coudurier
927509e10b indent
Originally committed as revision 13747 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-11 09:40:40 +00:00
Baptiste Coudurier
c6e2c6c9c6 support for 3gp metadata
Originally committed as revision 13746 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-11 09:40:22 +00:00
Baptiste Coudurier
07b7b06d92 move utf8 code before udta func, will be used by 3gp tags
Originally committed as revision 13745 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-11 09:35:02 +00:00
Baptiste Coudurier
c55cc074cc write usual brand for ipod format
Originally committed as revision 13744 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-11 09:33:35 +00:00
Baptiste Coudurier
d32d6defee simplify
Originally committed as revision 13743 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-11 09:06:27 +00:00
Baptiste Coudurier
20e22af85a factorize psp metadata
Originally committed as revision 13742 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-11 09:02:01 +00:00
Baptiste Coudurier
f7635edb4d cosmetics
Originally committed as revision 13741 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-11 08:50:41 +00:00
Baptiste Coudurier
c3858df291 cosmetics
Originally committed as revision 13740 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-11 08:39:35 +00:00
Baptiste Coudurier
709c9f8de3 support alac in ipod m4a format, tested on quicktime
Originally committed as revision 13739 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-11 08:17:38 +00:00
Baptiste Coudurier
ccec1b69c0 m4v/m4a are usual itunes/ipod/iphone extensions
Originally committed as revision 13737 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 22:14:58 +00:00
Baptiste Coudurier
d88812a91f indent
Originally committed as revision 13736 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 20:14:09 +00:00
Baptiste Coudurier
d1d87dfba0 rework udta handling, if any track set bitexact, don't write any metadata
Originally committed as revision 13735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 20:13:44 +00:00
Baptiste Coudurier
1dc7ff331a 10l, add parentheses
Originally committed as revision 13734 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 19:58:35 +00:00
Baptiste Coudurier
cabc1a7dce indent
Originally committed as revision 13733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 19:56:59 +00:00
Baptiste Coudurier
b63ba850c1 remove obsolete requirements, quicktime 6 is from 2002, not sure if muxing scheme still fits
Originally committed as revision 13732 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 19:56:45 +00:00
Baptiste Coudurier
0724373d2c cosmetics
Originally committed as revision 13731 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 18:23:06 +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
Baptiste Coudurier
96f69e0d87 warn if pts is not set, prevent writing negative/weird cts, happens when using genpts and streamcopy
Originally committed as revision 13519 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-29 00:58:41 +00:00
Baptiste Coudurier
c4f078ffe1 reindent
Originally committed as revision 13518 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-29 00:54:33 +00:00
Baptiste Coudurier
e95580e70a this should be valid for audio too
Originally committed as revision 13517 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-29 00:54:09 +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
Baptiste Coudurier
287d6cfad7 cosmetics: remove useless whitespaces and put braces correctly
Originally committed as revision 12942 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-24 17:22:39 +00:00
Baptiste Coudurier
463e7afd18 support for alac in .mov
Originally committed as revision 12938 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-24 13:59:39 +00:00
Baptiste Coudurier
b64518e91b special mpeg2 handling is no more needed
Originally committed as revision 12685 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-04 09:55:31 +00:00
Baptiste Coudurier
b371539a3d prevent writing empty stss atom
Originally committed as revision 12636 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-30 21:18:22 +00:00
Baptiste Coudurier
721da10aeb fix mpeg2 muxing, replace seq header if contained in extradata and key frame does not contain it
Originally committed as revision 12520 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-20 18:48:50 +00:00
Baptiste Coudurier
7b0f4c9aaa cosmetics, move case up
Originally committed as revision 12519 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-20 18:42:44 +00:00
Baptiste Coudurier
aa9f4208b6 ipod/iphone compatible mp4 muxer
Originally committed as revision 12458 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-16 13:36:36 +00:00
Baptiste Coudurier
91208916c6 cosmetics, remove whitespaces before and after parenthesis
Originally committed as revision 11879 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-06 18:57:00 +00:00
Michael Niedermayer
f70eccdb39 2 more missing consts found by -Wwrite-strings.
Originally committed as revision 11849 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 01:06:04 +00:00
Baptiste Coudurier
fa7343eaf2 stupid typo
Originally committed as revision 11693 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-31 13:40:53 +00:00
Baptiste Coudurier
ccac843872 support rawvideo in mov
Originally committed as revision 11691 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-31 11:31:56 +00:00
Baptiste Coudurier
4ad08accb2 use context in av_log
Originally committed as revision 11668 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-30 13:22:31 +00:00
Baptiste Coudurier
c8134d7104 warning is only valid for mov
Originally committed as revision 11667 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-30 13:22:04 +00:00
Baptiste Coudurier
0b98a7b3b2 cosmetics, split long lines, remove useless braces, merge comments and if
Originally committed as revision 11656 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 18:35:12 +00:00
Baptiste Coudurier
506e4bb8bc cosmetics, vertically align
Originally committed as revision 11655 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 18:33:27 +00:00
Baptiste Coudurier
bbe052463d spoke too fast, fix dv fourcc in mov accordingly if strict
Originally committed as revision 11653 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 16:58:42 +00:00
Baptiste Coudurier
ea1664e33a finally set codec tags for mov/mp4/3gp muxers, this should not break anything, if it breaks anything, yell
Originally committed as revision 11652 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 16:03:50 +00:00
Baptiste Coudurier
d97f214435 indentation
Originally committed as revision 11651 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 15:23:37 +00:00
Baptiste Coudurier
a23c9c4a50 correctly and only set standard stsd fourcc for mp4/3gp
Originally committed as revision 11650 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 15:22:07 +00:00
Baptiste Coudurier
d0c0a29b5a write esds atom when mpeg-4 systems tags are used
Originally committed as revision 11649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 13:44:27 +00:00
Baptiste Coudurier
2c2f58c0ad document tag field
Originally committed as revision 11647 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 13:19:16 +00:00
Aurelien Jacobs
9ab3f71b60 add a ff_ prefix to newly exported functions from avc.c
Originally committed as revision 11511 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-11 23:33:32 +00:00
Aurelien Jacobs
1bd2d763d4 Move isom_write_avcc() and related functions into a separate file.
Originally committed as revision 11498 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-11 01:24:55 +00:00
Aurelien Jacobs
6e6eebf919 extract isom_write_avcc into a function
Originally committed as revision 11497 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-11 01:04:01 +00:00
Aurelien Jacobs
de04ad45ec Add one more parameter to avc_parse_nal_units so that it allows not to
free the input buffer.
This is required by upcoming extraction of isom_write_avcc to a function.

Originally committed as revision 11496 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-11 01:00:04 +00:00
Aurelien Jacobs
ed7fa39c2d Check return value of avc_parse_nal_units().
Originally committed as revision 11495 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-11 00:47:02 +00:00
Baptiste Coudurier
b356f75d46 fix indentation
Originally committed as revision 11282 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-20 09:51:11 +00:00
Baptiste Coudurier
79e42311d3 use generic 'glbl' atom if extradata is present but no specific method is known
Originally committed as revision 11272 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-19 16:00:08 +00:00
Baptiste Coudurier
44fb8ebb62 fix dnxhd 720p in mov for quicktime player
Originally committed as revision 11154 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-03 10:44:25 +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
Benoit Fouet
cfac9ec701 Cosmetics: indentation.
Originally committed as revision 10853 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-24 14:22:56 +00:00
Benoit Fouet
89a0d7908b Prevent mov muxer from writing empty udta atoms.
Originally committed as revision 10852 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-24 14:20:15 +00:00
Baptiste Coudurier
86161ceca1 dont write udta atom for 3gp/3g2 for now, current written atoms (ilst) are itunes specific
Originally committed as revision 10757 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-16 16:40:34 +00:00
Baptiste Coudurier
00996920ed indentation
Originally committed as revision 10756 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-16 15:40:57 +00:00
Baptiste Coudurier
fc4cbc1699 DNxHD (SMPTE VC-3) encoder
Originally committed as revision 10682 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-08 11:27:18 +00:00
Ramiro Polla
89938d29b5 Typo
Originally committed as revision 10478 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-11 23:46:46 +00:00
Måns Rullgård
4f9e995a96 kill harmless 64-bit pointer cast warning
Originally committed as revision 9539 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-08 13:42:44 +00:00
Diego Biurrun
90b5b51eab misc typo fixes
Originally committed as revision 9291 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-12 18:50:50 +00:00
Diego Biurrun
755bfeabcc misc spelling fixes
Originally committed as revision 9289 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-12 09:29:25 +00:00
Baptiste Coudurier
911f9b714e warn user if video codec timebase is very high
Originally committed as revision 9232 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-06 13:21:50 +00:00
Aurelien Jacobs
b1b64c237f typo
Originally committed as revision 9159 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-30 10:04:37 +00:00
Michael Niedermayer
db8f4a92c9 warn the user about the the mdhd problem
(this is of course not a good solution but its better than silently
generating invalid files, we should find a better solution)

Originally committed as revision 9153 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-30 00:08:32 +00:00
Baptiste Coudurier
4f60f34a89 print and return error if output is non seekable
Originally committed as revision 9087 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-21 08:33:36 +00:00
Baptiste Coudurier
e23848a49c cosmectics, use consistant and homogeneous type names for atoms
Originally committed as revision 8828 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-26 11:36:05 +00:00
Baptiste Coudurier
ccba88d764 cosmectics, mov -> mp4
Originally committed as revision 8497 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-24 15:24:36 +00:00
Baptiste Coudurier
4278662d45 treat frame_size > 1 as compressed audio
Originally committed as revision 8461 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-21 10:03:27 +00:00
Baptiste Coudurier
10fc840c52 fix pcm u/s8 muxing
Originally committed as revision 8213 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-04 01:56:27 +00:00
Baptiste Coudurier
2260499caf deobfuscate, clearly split mov case
Originally committed as revision 8212 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-04 01:48:06 +00:00
Baptiste Coudurier
1e5f5e3b7a use common tables for mov muxer and demuxer
Originally committed as revision 8205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-03 14:55:11 +00:00
Michael Niedermayer
7caf0cc62c add codec_id <-> codec_tag tables to AVIn/OutputFormat
Originally committed as revision 7593 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 01:39:17 +00:00
Alex Beregszaszi
fead30d444 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
Originally committed as revision 7587 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-19 22:12:59 +00:00
Baptiste Coudurier
1aad0dfd62 remove useless sampleDuration
Originally committed as revision 7281 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-11 13:31:20 +00:00
Baptiste Coudurier
b596102e7e check codec frame size directly and only for audio
Originally committed as revision 7280 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-11 13:30:37 +00:00
Michael Niedermayer
79e5a53c0a utf8 title support for psp (untested)
Originally committed as revision 6939 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-08 01:15:06 +00:00
Steve L'Homme
e344c1ea36 reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
Originally committed as revision 6864 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-01 21:09:14 +00:00
Baptiste Coudurier
f45b744cb7 simplify
Originally committed as revision 6855 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-01 17:56:22 +00:00
Baptiste Coudurier
aa90239fd9 mov vfr muxing
Originally committed as revision 6854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-01 17:27:39 +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
Baptiste Coudurier
ffb512e349 move track timescale/sampleDuration init to write_header and return error if not set
Originally committed as revision 6167 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-04 14:22:44 +00:00
Baptiste Coudurier
5340a0bc9c wide atom is only defined in mov, use free for mp4/3gp
Originally committed as revision 6072 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-24 10:32:09 +00:00
Baptiste Coudurier
7228914047 set elst start time to first pts
Originally committed as revision 5981 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-11 09:27:40 +00:00
Baptiste Coudurier
2c5ad5fd74 use correct tag for h263 in mov
Originally committed as revision 5953 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-07 15:48:26 +00:00
Baptiste Coudurier
87494ea03c detailed infos about d263 atom
Originally committed as revision 5952 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-07 15:04:15 +00:00
Baptiste Coudurier
915282e5b8 indention
Originally committed as revision 5950 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-07 14:19:33 +00:00
Baptiste Coudurier
5997ed786a only set fields for mov, reserved for 3gp, mp4
Originally committed as revision 5949 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-07 14:18:43 +00:00
Baptiste Coudurier
80f05e7981 sampleSize field to 16, reserved for mp4 and 3gp
Originally committed as revision 5948 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-07 14:15:05 +00:00
Baptiste Coudurier
86ca5710bb mp4, 3gp field is reserved and value is 2
Originally committed as revision 5947 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-07 14:11:17 +00:00
Baptiste Coudurier
57ef6acc39 use ternary
Originally committed as revision 5946 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-07 14:09:17 +00:00
Baptiste Coudurier
c096ebca48 vbr compression id is only used in mov
Originally committed as revision 5945 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-07 14:06:23 +00:00
Baptiste Coudurier
e40ee6a268 move common code from mov.c and movenc.c to isom.c
Originally committed as revision 5882 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-01 14:58:15 +00:00
Måns Rullgård
9d9f4119bd move common stuff from avienc.c and wav.c to new file riff.c
Originally committed as revision 5720 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-12 00:09:34 +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
Baptiste Coudurier
ac3e183403 av_get_bits_per_sample and due simplifications
Originally committed as revision 5661 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-07 17:50:09 +00:00
Baptiste Coudurier
06fcf56c50 typo fix
Originally committed as revision 5642 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-06 14:57:55 +00:00
Baptiste Coudurier
875f92876a 10l, all modes is 0x81FF
Originally committed as revision 5641 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-06 14:46:01 +00:00
Baptiste Coudurier
b7d9da100d simplify and write correct values conforming to specs
Originally committed as revision 5640 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-06 14:38:50 +00:00
Michael Niedermayer
2111e3f9f2 check for unparsed AMR input
Originally committed as revision 5637 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-06 12:27:43 +00:00
Michael Niedermayer
9a39cd35b8 vbr requires version=1 and samplesize=0 per QT spec
untested, but if this doesnt work the issue is likely somewhere else, as iam just chaning the random nonsense we do to what the spec says should be done

Originally committed as revision 5636 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-06 12:17:01 +00:00
Baptiste Coudurier
5cb49ca11b write exact values for audio stsd v1
Originally committed as revision 5606 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-04 14:03:59 +00:00
Baptiste Coudurier
42fb414804 check only existing streams
Originally committed as revision 5521 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-25 00:10:52 +00:00
Baptiste Coudurier
0aec3c5cbf simplify
Originally committed as revision 5517 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-24 18:09:20 +00:00
Baptiste Coudurier
aa1c1c615a fix aac in mov for ipod
Originally committed as revision 5498 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-19 11:28:28 +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
Stefan Huehner
a97c1e93aa Add (mostly) const to variable and parameter declaration, where a char* was
used and 'const char*' should be, plus make some function declarations
static if they aren't used outside their declaring source file.
patch by Stefan Huehner stefan%%at%%huehner%%dot%%org

Originally committed as revision 5492 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-17 15:53:23 +00:00
Baptiste Coudurier
543eebd568 fix mp3 muxing
Originally committed as revision 5472 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-13 14:38:44 +00:00
Michael Niedermayer
7cf0e16f96 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
merging some related stuff from mobilehackers

Originally committed as revision 5406 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-19 01:53:59 +00:00
Michael Niedermayer
ed90d370ec dont store mov style meta tags in mp4 (fixes ffmpeg -title + gtkpod)
Originally committed as revision 5405 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-18 23:32:42 +00:00
Michael Niedermayer
6f276720ac dont write LAVF_ID if bitexact and any meta tag is set
Originally committed as revision 5404 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-18 23:03:16 +00:00
Michael Niedermayer
efda33957f simplify meta tag writing code
Originally committed as revision 5403 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-18 22:49:27 +00:00
Baptiste Coudurier
2c95f59f06 fix avc nal parsing
Originally committed as revision 5382 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-15 17:11:50 +00:00
Baptiste Coudurier
5e0c720a4e fix mulaw muxing
Originally committed as revision 5378 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-13 23:47:29 +00:00
Baptiste Coudurier
6dd19fff4d do not write wave if not needed
Originally committed as revision 5377 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-13 22:25:17 +00:00
Baptiste Coudurier
3a72cbd9f0 fix AMR muxing in mov
Originally committed as revision 5376 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-13 21:00:52 +00:00
Baptiste Coudurier
fcef991a85 add pcm 24/32 le/be support
Originally committed as revision 5375 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-13 20:05:02 +00:00
Michael Niedermayer
08db8f1846 simplify
Originally committed as revision 5374 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-13 18:45:29 +00:00
Baptiste Coudurier
039627cf48 clean and simplify
Originally committed as revision 5373 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-13 18:01:16 +00:00
Baptiste Coudurier
b451719e07 simplify, amr.c sets frame_size to 160, and sample size is always 8000
Originally committed as revision 5359 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-10 18:00:16 +00:00
Baptiste Coudurier
9c09db541e fix damr atom, needed for quicktime player
Originally committed as revision 5358 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-10 17:56:39 +00:00
Baptiste Coudurier
98d12b09af move declaration to mov.h
Originally committed as revision 5299 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-19 10:02:41 +00:00
Baptiste Coudurier
5616f85deb clean and simplify mov_write_packet
Originally committed as revision 5289 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-14 10:51:32 +00:00
Baptiste Coudurier
611fd605a3 get avcC profile and level indication from sps (from handbrake)
Originally committed as revision 5287 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-14 09:54:17 +00:00
Baptiste Coudurier
18c697acce write mdat in write_header avoid check in write_packet
Originally committed as revision 5286 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-13 13:21:20 +00:00
Baptiste Coudurier
32ba6fb141 dont write stss atom if keyframes only
Originally committed as revision 5284 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-11 08:12:54 +00:00
Baptiste Coudurier
a336965e70 fix edts for tracks without b frames
Originally committed as revision 5282 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-10 17:04:22 +00:00
Michael Niedermayer
87b041e0f0 little h.264 related hunk from diff between cvs and mobile hackerz
Originally committed as revision 5268 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-04 17:44:59 +00:00
Michael Niedermayer
9e282ba382 the PSP rejects video with too high bitrates so lets claim they arent too high ...
Originally committed as revision 5267 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-04 12:58:56 +00:00
Baptiste Coudurier
a3a80ddca0 use 64bit atom version if needed
Originally committed as revision 5220 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-26 13:34:51 +00:00
Baptiste Coudurier
3cdc7eb474 dvcpro is 411p in fact
Originally committed as revision 5199 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-22 16:49:05 +00:00
Baptiste Coudurier
c6e722e5e9 create edts atom when muxing B frames, needed to compute cts
Originally committed as revision 5151 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-11 18:21:28 +00:00
Baptiste Coudurier
c1b8e6d8a8 do nal reformating when muxing H264, create avcc atom
Originally committed as revision 5150 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-11 18:18:17 +00:00
Baptiste Coudurier
8e32161943 correct computing of DV fourcc in mov muxer
Patch by Baptiste COUDURIER, baptiste <<dot>> coudurier <<at>> smartjog <<dot>> com

Originally committed as revision 5124 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-08 00:39:23 +00:00
Baptiste Coudurier
26f86eaf03 ftyp patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
Originally committed as revision 5098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-02 19:28:35 +00:00
Baptiste Coudurier
1522767d0d compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
Originally committed as revision 5093 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-02 01:37:38 +00:00
Baptiste Coudurier
b4712e3c8b CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
Originally committed as revision 5051 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-22 23:46:20 +00:00
Baptiste Coudurier
e60b4ced1f mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
Originally committed as revision 4982 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-11 18:27:57 +00:00
Benjamin Larsson
dcfdb046ee Fix for title field in PSP compatible mp4 files. Patch by
Olivier, oandrieu <at> gmail.com.

Originally committed as revision 4889 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-24 08:03:42 +00:00
Benjamin Larsson
ed06cf6d1d gcc 2.95 fix
Originally committed as revision 4887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-23 14:28:50 +00:00
Michael Niedermayer
b29af723de >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
Originally committed as revision 4886 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-23 14:12:03 +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
François Revol
ab561df995 finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
Originally committed as revision 4792 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-30 20:34:08 +00:00
Diego Biurrun
bb270c0896 COSMETICS: tabs --> spaces, some prettyprinting
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-22 01:10:11 +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
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
Jan Kratochvil
11bec29441 AMR-WB for 3GPP patch by (Jan Kratochvil - kratochvil) / bugreport #1187101
Originally committed as revision 4427 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-10 00:38:46 +00:00
Erik Slagter
0c1e0bab66 This trivial patch adds "avc1" as fourcc for h264 in mp4, which makes it
a little bit more standard, although it still seems to lack some
metadata. Anyway, recent mplayer plays these streams without problems.

It also has two globally scoped global structs changed to "static".
patch by (Erik Slagter <erik slagter name)

Originally committed as revision 4386 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-06-19 23:45:54 +00:00
Nico Sabbi
5cad192d50 according to the standard the object_type for H264 is 33, not 241
Originally committed as revision 4323 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-30 17:32:02 +00:00
Michael Niedermayer
83fa2ef8cb round duration up in mov
Originally committed as revision 4242 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-14 19:48:32 +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
Michael Niedermayer
ced225a762 fix psp muxing (probably this fix is wrong but its better then nothing)
Originally committed as revision 4086 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-27 00:16:17 +00:00
Calcium
c64d476ccd 30_clean_up_global_header_flag.patch by (Calcium | calcium nurs or jp)
Originally committed as revision 4072 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-23 12:52:24 +00:00
Michael Niedermayer
8272de4ea2 fix time stored in mov
based upon 23_fix_timestamp_in_mov.patch by (Calcium | calcium nurs or jp)

Originally committed as revision 4067 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-23 11:15:45 +00:00
Michael Niedermayer
6c13c880fa trying to fix a few minor values in the mp4/mov muxer
Originally committed as revision 4063 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-23 00:26:43 +00:00
Måns Rullgård
88730be651 kill warnings patch by (Måns Rullgård <mru inprovide com>)
Originally committed as revision 3977 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-24 19:08:50 +00:00
tjraivio@cc.hut.fi
8536ab8964 quick patch for adding 3g2 support to ffmpeg (muxer and demuxer). No movie fragment support yet patch by (tjraivio cc.hut fi)
Originally committed as revision 3959 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-16 23:14:38 +00:00
Michael Niedermayer
0078e9b9c5 nonsense comment
Originally committed as revision 3958 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-16 23:11:11 +00:00
François Revol
0c716ab71d fix segfault by matthieu castet <castet DOT matthieu AT free DOT fr>
Originally committed as revision 3896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-28 12:13:53 +00:00
François Revol
25cf9062ba don't crash on null codec; by matthieu castet <castet DOT matthieu AT free DOT fr>
Originally committed as revision 3894 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-28 11:19:47 +00:00
François Revol
46103f6bbd fix the patch to allow Sony PSP MP4 creation
Originally committed as revision 3893 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-28 08:08:42 +00:00
Roine Gustafsson
501866a1fa movenc illegal access patch by Roine Gustafsson <roine AT users DOT sourceforge DOT net>
Originally committed as revision 3891 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-27 15:41:03 +00:00
tjcannell@blueyonder.co.uk
8af1815481 Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
Originally committed as revision 3889 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-27 14:48:15 +00:00
Roine Gustafsson
53ffdd1434 mov header field and compressor name patch by Roine Gustafsson <roine AT users DOT sourceforge DOT net>
Originally committed as revision 3885 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-26 09:31:49 +00:00
Roine Gustafsson
caacd4deea add -vtag and-atag support to mov patch by (Roine Gustafsson <roine at users sourceforge net>)
Originally committed as revision 3756 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-12-17 19:23:53 +00:00
Patrice Bensoussan
b6c50eb17c iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
Originally committed as revision 3388 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-08-14 14:05:48 +00:00
Gildas Bazin
ef19c7eb3f AAC in mov/mp4 patch by (Gildas Bazin <gbazin at altern dot org>)
Originally committed as revision 3359 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-28 09:40:59 +00:00
Michael Niedermayer
ffdd57d47e warn user if ms style codec tag is used
remove "    " codec tag

Originally committed as revision 3307 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-13 20:59:29 +00:00
Michael Niedermayer
e928649b0b pass AVPacket into av_write_frame()
fixes the random dts/pts during encoding
asf preroll fix
no more initial zero frames for b frame encoding
mpeg-es dts during demuxing fixed
.ffm timestamp scale fixed, ffm is still broken though

Originally committed as revision 3168 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-29 02:06:32 +00:00
Michael Niedermayer
75553f825c bit-exact
Originally committed as revision 3007 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-12 20:06:23 +00:00
Alex Beregszaszi
21f52609dd support for -timestamp
Originally committed as revision 2978 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-07 14:00:16 +00:00
Alex Beregszaszi
8cc7a34dd0 support for wider range of codecs
Originally committed as revision 2973 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-07 12:47:33 +00:00
Roman Shaposhnik
906b578f16 * fixing 10l in movenc.c + updating regression patterns.
Originally committed as revision 2938 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-28 03:29:00 +00:00
Roman Shaposhnik
9a4d938874 * making .mov files generated by ffmpeg compatible with Apple software.
Originally committed as revision 2937 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-28 02:17:06 +00:00
Roman Shaposhnik
ca20f118d1 * enabling DV-in-QT
* fixing a bug in movenc.c: for QT files hdrl should contain 'mhlr'

Originally committed as revision 2928 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-26 09:04:06 +00:00
Falk Hüffner
7906085fcc warning patrol
Originally committed as revision 2925 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-24 23:32:48 +00:00
Michael Niedermayer
4bfc029f83 10l (1 vs. descrLength(1)) found by (Jean Le Feuvre - jeanlf)
Originally committed as revision 2864 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-09 21:54:25 +00:00
Gildas Bazin
69dde1ad36 AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
and regression test checksum update for it by me

Originally committed as revision 2787 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-02-14 19:08:09 +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
dd0003fa3d removing borderline spyware
Originally committed as revision 2478 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-11-04 12:55:26 +00:00
Gildas Bazin
e45ccf79be movenc patch by (Gildas Bazin <gbazin at altern dot org>)
Originally committed as revision 2476 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-11-03 21:51:07 +00:00
Dan Christiansen
4cb3f3b637 Using the extension m4a for audio only MPEG-4 files is increasingly
common, especially since Apple iTunes treats files with the two
extensions differently. Without the patch, FFmpeg won't know that m4a
is for MPEG-4 files
patch by (Dan Christiansen <danchr at daimi dot au dot dk>)

Originally committed as revision 2398 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-19 20:57:47 +00:00
Thomas Raivio
f578f93838 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
Originally committed as revision 2314 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-28 21:09:32 +00:00
Fabrice Bellard
490579042a 64 bit pts for writing - more const usage
Originally committed as revision 2255 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-10 22:37:33 +00:00
Michael Niedermayer
2187d9482e theres no SVQ1 encoder -> it cant be default
Originally committed as revision 2252 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-10 10:46:50 +00:00
Michael Niedermayer
6e6d6dc0a5 mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
Originally committed as revision 2249 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-09 23:03:04 +00:00
Mike Melanson
1a31840cea naughty, forbidden variable declarations
Originally committed as revision 2171 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-27 01:26:14 +00:00
Michael Niedermayer
1cb5f7fd41 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
Originally committed as revision 2168 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-26 20:23:13 +00:00