Commit Graph

156 Commits

Author SHA1 Message Date
Joseph Wecker
4ee53d7e86 flvenc: Correctly encode data stream into in-band metadata frames. 2011-09-07 02:38:15 +02:00
Joseph Wecker
30bcd6a945 flv: Ammon's changes migrated from 0.6.0 - I believe for the android broadcaster. 2011-09-07 02:02:03 +02:00
Nicolas George
1c58264e62 flvenc: use avcodec_get_name to report unsupported codecs. 2011-08-22 12:13:27 +02:00
Michael Niedermayer
27fbe31c92 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  Revert "avconv: use stream copy by default when possible."
  avconv: print stream copy information.
  avconv: use stream copy by default when possible.
  matroskaenc: vertical alignment.
  matroskaenc: implement query_codec()
  lavf: add avformat_query_codec().
  lavc: add avcodec_get_type() for mapping codec_id -> type.
  flvenc: use int64_t to store offsets
  avconv: don't segfault on 0 input files.
  Do not write ID3v1 tags by default
  mpegts: log into an AVFormatContext rather than MpegTSContext.

Conflicts:
	doc/APIchanges
	libavcodec/version.h
	libavformat/avformat.h
	libavformat/mp3enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-17 14:23:20 +02:00
Luca Barbato
7f5bf4fbaf flvenc: use int64_t to store offsets
Metadata currently is written only at the start of the file in normal
cases, when transcoding from a rtmp source metadata could be
written later and the offset recorded can exceed 32bit.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-08-16 20:24:20 +02:00
Michael Niedermayer
78accb876c Merge remote-tracking branch 'qatar/master'
* qatar/master:
  ffmpeg: fix some indentation
  ffmpeg: fix operation with --disable-avfilter
  simple_idct: remove disabled code
  motion_est: remove disabled code
  vc1: remove disabled code
  fate: separate lavf-mxf_d10 test from lavf-mxf
  cabac: Move code only used in the cabac test program to cabac.c.
  ffplay: warn that -pix_fmt is no longer working, suggest alternative
  ffplay: warn that -s is no longer working, suggest alternative
  lavf: rename enc variable in utils.c:has_codec_parameters()
  lavf: use designated initialisers for all (de)muxers.
  wav: remove a use of deprecated AV_METADATA_ macro
  rmdec: remove useless ap parameter from rm_read_header_old()
  dct-test: remove write-only variable
  des: fix #if conditional around P_shuffle
  Use LOCAL_ALIGNED in ff_check_alignment()

Conflicts:
	ffmpeg.c
	libavformat/avidec.c
	libavformat/matroskaenc.c
	libavformat/mp3enc.c
	libavformat/oggenc.c
	libavformat/utils.c
	tests/ref/lavf/mxf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-17 20:12:02 +02:00
Anton Khirnov
dfc2c4d900 lavf: use designated initialisers for all (de)muxers.
It's more readable and less prone to breakage.
2011-07-17 06:58:37 +02:00
Michael Niedermayer
976a8b2179 Merge remote-tracking branch 'qatar/master'
* qatar/master: (40 commits)
  H.264: template left MB handling
  H.264: faster fill_decode_caches
  H.264: faster write_back_*
  H.264: faster fill_filter_caches
  H.264: make filter_mb_fast support the case of unavailable top mb
  Do not include log.h in avutil.h
  Do not include pixfmt.h in avutil.h
  Do not include rational.h in avutil.h
  Do not include mathematics.h in avutil.h
  Do not include intfloat_readwrite.h in avutil.h
  Remove return statements following infinite loops without break
  RTSP: Doxygen comment cleanup
  doxygen: Escape '\' in Doxygen documentation.
  md5: cosmetics
  md5: use AV_WL32 to write result
  md5: add fate test
  md5: include correct headers
  md5: fix test program
  doxygen: Drop array size declarations from Doxygen parameter names.
  doxygen: Fix parameter names to match the function prototypes.
  ...

Conflicts:
	libavcodec/x86/dsputil_mmx.c
	libavformat/flvenc.c
	libavformat/oggenc.c
	libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-04 00:45:21 +02:00
Mans Rullgard
ee8aecd23a Do not include intfloat_readwrite.h in avutil.h
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-03 21:42:06 +01:00
Michael Niedermayer
f9ecb849ef Merge remote-tracking branch 'qatar/master'
* qatar/master:
  crypto: Use av_freep instead of av_free
  lavf: don't try to free private options if priv_data is NULL.
  swscale: fix types of assembly arguments.
  swscale: move two macros that are only used once into caller.
  swscale: remove unused function.
  options: Add missing braces around struct initializer.
  mov: Remove leftover crufty debug statement with references to a local file.
  dvbsubdec: Fix compilation of debug code.
  Remove all uses of now deprecated metadata functions.
  Move metadata API from lavf to lavu.

Conflicts:
	doc/APIchanges
	libavformat/aiffdec.c
	libavformat/asfdec.c
	libavformat/avformat.h
	libavformat/avidec.c
	libavformat/cafdec.c
	libavformat/matroskaenc.c
	libavformat/mov.c
	libavformat/mp3enc.c
	libavformat/wtv.c
	libavutil/avutil.h
	libavutil/internal.h
	libswscale/swscale.c
	libswscale/x86/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-09 04:47:19 +02:00
Anton Khirnov
d2d67e424f Remove all uses of now deprecated metadata functions. 2011-06-08 07:43:45 +02:00
Michael Niedermayer
174df6affc Merge remote-tracking branch 'qatar/master'
* qatar/master:
  build: remove empty $(OBJS) target
  build: make rule for linking ff* apply only to these targets
  build: rearrange some lines in a more logical way
  s302m: fix resampling for 16 and 24bits.
  ARM: remove MUL64 and MAC64 inline asm
  build: clean up .PHONY lists
  build: move all (un)install* target aliases to toplevel Makefile
  flvenc: propagate error properly
  build: remove stale dependency
  build: do not add CFLAGS-yes to CFLAGS
  utils.c: fix crash with threading enabled.
  configure: simplify source_path setup
  configure: remove --source-path option
  lavf: deprecate AVFormatParameters.time_base.
  img2: add framerate private option.
  img2: add video_size private option.
  img2: add pixel_format private option.
  tty: add framerate private option.

Conflicts:
	Makefile
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-07 03:37:57 +02:00
Luca Barbato
0e28e9ca8f flvenc: propagate error properly
avio_flush can fail, in particular when used with the rtmp/librtmp
protocol.
2011-06-06 10:53:19 -05:00
Baptiste Coudurier
c22f2527ed In mov and flv muxer, check aac bitstream validity. 2011-04-18 14:30:14 -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
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
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
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
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
bbc413f943 lavf: replace remaining uses of put_tag with avio_write
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-25 14:38:56 -05: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
ae628ec1fd avio: rename ByteIOContext to AVIOContext.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 08:37:15 -05: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
Stefano Sabatini
b9f9e59afc Replace deprecated CODEC_TYPE_AUDIO and CODEC_TYPE_VIDEO with the
corresponding AVMEDIA_TYPE_* symbols.

Originally committed as revision 25201 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-25 23:27:16 +00:00
Tomás Touceda
16f825085a FLV Metadata
Patch by Tomás Touceda, chiiph gentoo org

Originally committed as revision 25101 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-10 23:29:07 +00:00
Thierry Foucu
df4f1d5108 Add AVC EOS tag to H264-encoded FLV files.
Patch by Thierry Foucu, tfoucu gmail

Originally committed as revision 24820 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-18 09:39:21 +00:00
Francesco Lavra
80b39e1ca6 Move AVCodecTag from riff.h into internal.h.
Patch by Francesco Lavra, francescolavra interfree it

Originally committed as revision 23250 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-22 16:01:32 +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
Justin Johnson
c5e1e9827d Guess the duration before converting video and write guessed duration
into flv header.

Patch by Justin Johnson, justin D johnson3 A gmail

Originally committed as revision 21615 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-02 22:23:09 +00:00
Daniel Verkamp
8e9efe4392 FLV 8-bit PCM is unsigned, not signed
Fixes issue #1569

Originally committed as revision 20853 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-14 03:30:25 +00:00
Daniel Verkamp
1b88277bd9 FLV muxer support for Flash screen codec v2
Originally committed as revision 20564 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-20 20:02:49 +00:00
Justin Ruggles
68677dd8ed Log a clearer warning message when muxing FLV with Speex containing more than
8 frames per packet.

Originally committed as revision 20247 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-16 10:04:35 +00:00
Justin Ruggles
046c400103 Add Speex support to the FLV muxer.
Originally committed as revision 20245 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-16 03:02:25 +00:00
Michael Niedermayer
e458dd0be0 Flv should be AVFMT_VARIABLE_FPS.
Originally committed as revision 19873 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-16 01:49:34 +00:00
Yoshihisa Uchida
3f3f3ba799 Fix onMetaData property count in flv files (issue 1206).
Patch by Yoshihisa Uchida, yoshihisa D uchida A gmail

Originally committed as revision 19236 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-20 12:52:48 +00:00
Stefan de Konink
426a6f34a0 Splits the totalbitrate in a videodatarate and audiodatarate part.
Patch by Stefan de Konink stefan konink de

Originally committed as revision 16944 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 16:10:46 +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
71e685b018 use ff_avc_parse_nal_units_buf because output size might differ from input size
Originally committed as revision 16626 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-16 01:22:30 +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
fd7f59639c remove comment, this is not relevant anymore
Originally committed as revision 16528 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 05:24:41 +00:00
Baptiste Coudurier
2ba0470e81 reindent
Originally committed as revision 16527 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 05:23:46 +00:00
Baptiste Coudurier
7d637efa80 check for negative dts value even if bitstream is already formated,
this fixes dts when stream copying.

Originally committed as revision 16526 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 05:23:10 +00:00
Alexander Wichers
8ddd280d2d Nellymoser 8KHZ flv muxing fix, patch by Alexander Wichers development at wichersdot nu
Originally committed as revision 15633 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-18 12:10:08 +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
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
b83a00b8b6 timestamps in flv are 32bits _signed_ according to flash player, specs are wrong
Originally committed as revision 15045 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 03:07:31 +00:00
Baptiste Coudurier
6f4eb12d31 remove now useless casts
Originally committed as revision 15044 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 03:01:59 +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
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
c2acba13a4 check if extradata comes from mp4 and assume bitsteam is already formated, should fix streamcopy
Originally committed as revision 13516 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-29 00:35:23 +00:00
Baptiste Coudurier
f23496b562 aac and h264 in flv muxing
Originally committed as revision 13438 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 22:00:35 +00:00
Baptiste Coudurier
a9ee86e79b set correct duration when using b frames
Originally committed as revision 13372 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-25 01:22:06 +00:00
Baptiste Coudurier
5366f15d05 simplify, remove useless vars
Originally committed as revision 13270 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 00:03:00 +00:00
Bartlomiej Wolowiec
b7d1cd02e3 Nellymoser handling in FLV
Originally committed as revision 13032 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-02 19:35:31 +00:00
Baptiste Coudurier
254629b1aa set wrap bits to 32bit to actually use it
Originally committed as revision 12948 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-25 09:04:38 +00:00
Michael Niedermayer
44de39f93c flv/swf do not have a big endian codec id, they only support
little endian and native endian.

Originally committed as revision 12183 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-24 00:57:15 +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
Alex Beregszaszi
018b6fb465 Honor the 8bit extension (now 32bit instaed 24bit) of the pts field introduced in FLV specification v9.
Originally committed as revision 11043 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-16 00:09:34 +00:00
Alex Beregszaszi
964ff35445 Prefer ADPM_SWF instead NONE if no MP3 encoding is compiled in.
Originally committed as revision 11042 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-15 23:53:19 +00:00
Michael Niedermayer
ec62727818 indent
Originally committed as revision 10693 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-09 01:12:27 +00:00
Michael Niedermayer
4838727ea0 avoid generating invalid files
fixes issue213

Originally committed as revision 10692 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-09 01:01:07 +00:00
Michael Niedermayer
f683dbdc6a set the previous tag size correctly in flv files
Originally committed as revision 9919 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-04 23:03:17 +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
Benjamin Larsson
e9509536a9 Set FLV_SAMPLESSIZE_16BIT for ADPCM.
Originally committed as revision 8201 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-03 09:16:38 +00:00
Michael Niedermayer
bb85077fc9 remove now useless codec_tag setting code in muxers
Originally committed as revision 7603 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 12:44:58 +00:00
Michael Niedermayer
6c77805fc8 get rid of the [4] limitation of codec tag lists
Originally committed as revision 7596 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 12:08:31 +00:00
Michael Niedermayer
edb6e50682 export a few more codec_tag-codec_id tables
Originally committed as revision 7594 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 02:12:34 +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
Diego Biurrun
6ebe07fbb5 variable renaming: mp3lame --> libmp3lame
Originally committed as revision 7417 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-07 00:02:15 +00:00
Benjamin Larsson
09d8c0ae83 VP6 and flashsv stream copy and muxing support.
Originally committed as revision 7399 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-01 22:52:22 +00:00
Allan Hsu
148c9bdbb8 Patch for the FLV muxer to supply more complete metadata
in the onMetaData header. Patch by Allan Hsu <allan at counterpop dot net>.

Originally committed as revision 7382 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-28 12:35:22 +00:00
Michael Niedermayer
c45388b193 set flags correctly in write header instead of seeking back and fixing it in write_trailer()
Originally committed as revision 7267 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-10 17:12:45 +00:00
Allan Hsu
6cac3a3b08 Defines various common FLV format values between the FLV muxer and demuxer
in a common flv.h.
patch by Allan Hsu  allan _at_ counterpop.net

Originally committed as revision 7231 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-06 00:23:04 +00:00
Allan Hsu
56cca5f10c Fix wrong flags for S16LE and S16BE audio in FLV files.
patch by Allan Hsu, allan counterpop net

Originally committed as revision 7194 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-01 10:26:54 +00:00
Steve L'Homme
949b1a13bf Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
patch by Steve Lhomme, slhomme divxcorp com

Originally committed as revision 6868 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-01 22:39:58 +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
634b8cfaf4 always write duration and file size, fix seeking, progress bar is now active
Originally committed as revision 5939 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-06 15:29:50 +00:00
Michael Niedermayer
fd0fb3064d add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
Originally committed as revision 5779 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-17 21:51:21 +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
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
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
Alex Beregszaszi
2fde8aaeba support transcoding adpcm
Originally committed as revision 4689 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-11-12 20:01:23 +00:00
Michael Niedermayer
a254c5745b kill duplicated get/put_be24()
Originally committed as revision 4460 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-19 14:41:08 +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
Michael Niedermayer
e817a73daa fix mimetype
Originally committed as revision 4234 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-13 12:09:45 +00:00
Alex Beregszaszi
2f5132e7a8 proper handling of samplesize
Originally committed as revision 3980 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-25 11:15:12 +00:00
Alex Beregszaszi
923bd441fe correct pcm in flv handling
Originally committed as revision 3968 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-21 18:05:21 +00:00
Michael Niedermayer
37cdf93d6e assert(0) -> retunrn -1
Originally committed as revision 3285 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-02 19:26:51 +00:00
Michael Niedermayer
75293f05f9 simplify
Originally committed as revision 3252 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-25 20:03:51 +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
9ee91c2f53 move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
Originally committed as revision 3148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-21 20:43:21 +00:00
Michael Niedermayer
11a8e42573 various fixes
Originally committed as revision 3031 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-18 15:26:57 +00:00
Michael Niedermayer
068f2a22db cleanup
fix streamcopy

Originally committed as revision 3026 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-17 12:04:59 +00:00
Michael Niedermayer
92a267756f flv fixes
Originally committed as revision 2863 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-09 20:14:34 +00:00