virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
60,810 Commits 37 Branches 400 Tags 460 MiB
f93bd82ee6
Commit Graph

416 Commits

Author SHA1 Message Date
Diego Biurrun
919d7a345a Replace DEBUG_SEEK/DEBUG_SI + av_log combinations by av_dlog. 2011-06-10 19:12:14 +02: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
d552f616a2 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (28 commits)
  Remove some non-compiling debug messages.
  ffplay: Fix non-compiling debug printf and replace it by av_dlog.
  H264: x86 predict init cosmetics.
  ac3enc: Fix linking of AC-3 encoder without the E-AC-3 encoder.
  Move E-AC-3 encoder functions to a separate eac3enc.c file.
  ac3enc: remove convenience macro, #define DEBUG
  ac3enc: remove unused #define
  vc1: re-initialize tables after width/height change.
  APIchanges: fill-in git commit hash for av_get_bytes_per_sample() addition
  samplefmt: add av_get_bytes_per_sample()
  iirfilter: fix biquad filter coefficients.
  swscale: remove duplicate conversion routine in swScale().
  swscale: add yuv2planar/packed function typedefs.
  swscale: integrate yuv2nv12X_C into yuv2yuvX() function pointers.
  swscale: reindent x86 init code.
  swscale: extract SWS_FULL_CHR_H_INT conditional into init code.
  swscale: cosmetics.
  swscale: remove alp/chr/lumSrcOffset.
  swscale: un-special-case yuv2yuvX16_c().
  shorten: Remove stray DEBUG #define and corresponding av_dlog statement.
  ...

Conflicts:
	doc/APIchanges
	libavcodec/ac3enc.c
	libavutil/avutil.h
	libavutil/samplefmt.c
	libswscale/swscale.c
	libswscale/swscale_internal.h
	libswscale/x86/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-08 05:25:28 +02:00
Diego Biurrun
d7cf5639e7 Replace some printf instances in debug code by av_log. 2011-06-07 13:20:57 +02:00
Mans Rullgard
e65ab9d94f Remove unused variables 2011-06-02 20:06:00 +01:00
Reimar Döffinger
1795364205 Remove unused variables. 2011-05-07 20:14:47 +02:00
Michael Niedermayer
187528441a avidec: correct frame_offset for seeking 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-06 03:54:35 +02:00
Michael Niedermayer
5e24098b84 avidec: detect mpeg4 keyframes in indexless avi 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-06 02:21:36 +02:00
Reimar Döffinger
148ffcd2ce Make DV (sub) demuxer set proper pkt->pos values. 
This makes the avi demuxer create packets with proper pos values
with the file from ticket #140.
 2011-05-02 18:38:01 +02:00
Reimar Döffinger
1a9f9f81b1 Do not drop packets with no valid ->pos set as e.g. DV-in-AVI produces. 
Fixes ticket #140.
 2011-04-30 23:06:04 +02:00
Michael Niedermayer
ffdc49df25 AVIDEC: use_odmc demuxer specific option. (mostly an exmaple for demuxer specific options) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-30 22:09:15 +02:00
Michael Niedermayer
3788a3c0c0 Merge remote branch 'qatar/master' 
* qatar/master:
  graphparser: add a NULL check on the argument passed to strstr
  setdar: prefer "sar" over "par" in log info message
  fade: fix draw_slice() check on fade->factor value
  fade: make draw_slice() chroma check against planes 1 and 2
  win32: include the correct header in cmdutils.c
  ac3: fix memleak in fixed-point encoder
  flashsv: Return more meaningful error values.
  flashsv: Employ explicit AVCodec struct initializers.
  read AVI palette from the end of extradata
  cosmetics: K&R coding style and more whitespace for Flash Screen Video

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-26 04:21:15 +02:00
Reimar Döffinger
5e9de76f54 Do not set non_interleaved for DV-in-AVI. 
It does not make sense (DV is interleaved by design) and
it avoids a crash when the non-interleaved code tries to
use the priv_data of streams created by the DV demuxer.
The crash could be avoided differently, but then that stream
would still lack an index and would not play correctly in
non-interleaved mode.
Fixes e.g. samples/ffmpeg-bugs/roundup/issue1514/Dennis0002_video1.avi
 2011-04-25 14:17:59 +02:00
Kostya Shishkov
23f40a0788 read AVI palette from the end of extradata 
Official AVI specification says that stream header in case of video contains
BITMAPINFO, which is equal to BITMAPINFOHEADER and optional palette. Currently
lavf AVI demuxer thinks otherwise which produces garbage on codecs that have
both palette and extradata (luckily, there are not so many such codecs).

An example of such file is:
http://samples.multimedia.cx/V-codecs/KMVC/baseball1.avi
(IIRC, MSS1 or MSS2 also had such situation but they are still not supported
by lavc).

As a side note, passing palette in extradata as it's been done previously is
not quite correct since proper _extra_ data is surplus bytes in
BITMAPINFOHEADER, not including palette.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-04-24 23:26:45 -07:00
Michael Niedermayer
fbfcc8f1b7 avi: try to synchronize the points in time of the starts of streams after seeking. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-24 22:38:05 +02:00
Michael Niedermayer
8a68697dc6 Add flag to force demuxers to sort more strictly by dts. 
This enables non interleaved AVI mode for example.
Players that are picky on strict interleaving can set this.
Patches to only switch to non intereaved AVI mode when the index is not strictly
correctly interleaved are welcome.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-24 21:48:36 +02:00
Michael Niedermayer
2d2b5a1421 10l, commit that should have been stashed into the merge. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-17 23:59:00 +02:00
Michael Niedermayer
c40798441f Merge remote branch 'qatar/master' 
* qatar/master:
  ac3dec: fix processing of delta bit allocation information.
  vc1: fix fate-vc1 after previous commit.
  wmv3dec: fix playback of complex WMV3 files using simple_idct.
  make av_dup_packet() more cautious on allocation failures
  make containers pass palette change in AVPacket
  introduce side information for AVPacket

Politic commits that have not been pulled:
  Update regtest checksums after revision 6001dad.
  Replace more FFmpeg references by Libav.
  Replace references to ffmpeg-devel with libav-devel; fix roundup URL.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-17 23:43:54 +02:00
Diego Biurrun
6001dad6e2 Replace more FFmpeg references by Libav. 2011-04-17 19:31:49 +02:00
Kostya Shishkov
2d8591c27e make containers pass palette change in AVPacket 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-04-15 18:02:05 +02:00
Michael Niedermayer
85b2114759 Merge commit 'a3a0af4fb1237bed0af75868073f9a63db8b1864' 
* commit 'a3a0af4fb1237bed0af75868073f9a63db8b1864':
  avutil: make aes and sha api public
  handle malloc failures in ff_get_wav_header
  add xWMA demuxer
  mpegts: force the default timebase
  libavcodec: Bump micro after adding the dtx AVOptions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-15 04:50:06 +02:00
Max Horn
ca402f32e3 handle malloc failures in ff_get_wav_header 
ff_get_wav_header is reading data from a WAVE file and then uses it
(without validation) to malloc a buffer. It then proceeded to read
data into the buffer, without verifying that the allocation succeeded.

To address this, change ff_get_wav_header to return an error if
allocation failed, and adapted all calling code to handle that error.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-04-14 13:56:09 +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
5b56ad03fa Reimplement stream probe try #2 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-03 16:40:11 +02:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
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
Anton Khirnov
384c9c2fa7 avio: add avio_tell macro as a replacement for url_ftell 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit a2704c9712)
 2011-03-05 02:29:31 +01:00
Anton Khirnov
a2704c9712 avio: add avio_tell macro as a replacement for url_ftell 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-04 11:26:57 -05:00
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
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
90ed2776ea avio: rename av_alloc_put_byte -> avio_alloc_context for consistency 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 8d9ac969cb)
 2011-02-22 02:44:36 +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
8d9ac969cb avio: rename av_alloc_put_byte -> avio_alloc_context for consistency 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-21 10:23:44 -05:00
Anton Khirnov
471fe57e1a avio: rename ByteIOContext to AVIOContext. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ae628ec1fd)
 2011-02-20 19:05:47 +01:00
Anton Khirnov
ae628ec1fd avio: rename ByteIOContext to AVIOContext. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-20 08:37:15 -05:00
Anton Khirnov
f8d33a3617 avidec: simplify read_gab2_sub 
Use avio functions instead of bytestream ones (also drops dependency on
lavc and removes a bunch of warnings).
Drop custom version of avio_get_str16 and use that instead.

Tested on mewmew-ssa.avi sample.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 47fdf00a77)
 2011-02-09 03:31:17 +01:00
Anton Khirnov
47fdf00a77 avidec: simplify read_gab2_sub 
Use avio functions instead of bytestream ones (also drops dependency on
lavc and removes a bunch of warnings).
Drop custom version of avio_get_str16 and use that instead.

Tested on mewmew-ssa.avi sample.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-06 20:30:28 -05:00
Clément Bœsch
bffad70c66 Remove forgotten if (p) av_free(p) forms 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 290849e2a4)
 2011-02-06 20:31:44 +01:00
Clément Bœsch
290849e2a4 Remove forgotten if (p) av_free(p) forms 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-02-04 10:00:52 +00: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
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
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
Mans Rullgard
3e8c4f9689 avidec: make print_tag() a macro and remove related ifdefs 
The dprintf macro is a no-op if DEBUG is not defined, so there
is no need to guard it here.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 6081f8c4e2)
 2011-01-26 03:43:30 +01:00
Mans Rullgard
6081f8c4e2 avidec: make print_tag() a macro and remove related ifdefs 
The dprintf macro is a no-op if DEBUG is not defined, so there
is no need to guard it here.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-25 02:43:28 +00:00
Peter Ross
456a70aeb8 add ff_get_bmp_header 
Originally committed as revision 26091 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-26 01:23:44 +00:00
Aurelien Jacobs
8ba5bf5a7c avidec: read some of the Nikon specific tags produced by Nikon cameras 
Originally committed as revision 25821 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-24 20:53:27 +00:00
Aurelien Jacobs
73d0e33102 avidec: support non-standard creation_time format 
Originally committed as revision 25815 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-23 12:04:50 +00:00
Aurelien Jacobs
d35cdd5719 avidec: trivial simplification regarding av_metadata_set 
Originally committed as revision 25814 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-23 12:03:23 +00:00
Aurelien Jacobs
933875a0f5 avidec: export creation_date as metadata 
Originally committed as revision 25785 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-21 19:00:07 +00:00
Anton Khirnov
03700d399b Export metadata in the generic format. Deprecate old conversion API. 
patch by Anton Khirnov  anton _at_ khirnov _dot_ net

Originally committed as revision 25493 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 19:04:25 +00:00
Carl Eugen Hoyos
2b50c4f6cc Cosmetics: Reindent after r25023. 
Originally committed as revision 25024 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-02 11:53:09 +00:00
Andrew Wason
4ed899f2c5 Fix crash when decoding DV in AVI introduced in r24579 (issue 2174). 
Patch by Andrew Wason, rectalogic rectalogic com

Originally committed as revision 25023 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-02 11:51:32 +00:00
Aurelien Jacobs
f138fa78a3 100l: av_freep() needs the address of the pointer 
Originally committed as revision 24613 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-30 23:41:12 +00:00
Aurelien Jacobs
37287d41f4 avidec: demux ASS and SRT tracks out of GAB2 chunks 
Originally committed as revision 24579 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-29 22:17:30 +00:00
Jai Menon
bbfb2c8077 avidec : Free packet if dv_produce_packet fails. 
Originally committed as revision 24281 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-17 05:40:18 +00:00
Jai Menon
a58e6ceae0 avidec : Free codec context before initializing the chained DV demuxer. 
Originally committed as revision 24279 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-17 05:08:01 +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
Michael Niedermayer
9862f9e149 Disable dshow specific bug emulation for amv files as they arent 
demuxed by ms dshows buggy demuxer normally.

Originally committed as revision 24012 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-02 23:39:02 +00:00
Michael Niedermayer
89ac23cd40 Rename block_align variable in the avi demuxer to clearly seperate its purpose 
from the true block_align.

Originally committed as revision 24011 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-02 23:33:10 +00:00
Michael Niedermayer
d01144b9d3 Duplicate rounding that MS does in one of their implementations of an avi demuxer. 
Fixes issue740
Based on patch by Cory Fields theuni-nospam- >xbmc @org

Originally committed as revision 23999 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-02 15:09:27 +00:00
Michael Niedermayer
8a472821a4 Factorize get_duration() out of 4 places of the avi demuxer. 
Originally committed as revision 23934 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-01 13:50:15 +00:00
Michael Niedermayer
0c0fd063dd Prevent infinite recursion of odml indexes. 
This fixes a stack overflow.

Originally committed as revision 23925 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-01 00:09:08 +00:00
Michael Niedermayer
fbfccc0404 Disable non interleaved avi code when there is no index available. 
Fixes issue1956.

Originally committed as revision 23202 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-20 18:34:44 +00:00
Thierry Foucu
e1954bb5ca Do not use pkt->size when it is potentially uninitialized. 
Patch by Thierry Foucu, tfoucu gmail

Originally committed as revision 23017 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-04 17:17:16 +00:00
Sebastian Vater
bf29cbc2cc Change a %2 to &1. Patch by Sebastian Vater <cdgs DOT basty googlemail com>. 
Originally committed as revision 22922 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-20 17:05:02 +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
Reimar Döffinger
28eb577390 Avoid creating tiny (possibly only 64 bytes large) audio packets resulting in 
huge processing and memory usage overhead for avi files with raw PCM audio.

Originally committed as revision 22521 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-14 13:38:00 +00:00
Anton Khirnov
04d2540c4b Add AVI metadata conversion table. 
Patch by Anton Khirnov (gmail{wyskas}).

Originally committed as revision 21653 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-06 12:32:44 +00:00
Michael Niedermayer
7a9af8ec19 Support strn tag in avidec. 
Originally committed as revision 21643 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-05 12:16:59 +00:00
Michael Niedermayer
1ac0893799 Correcting wrong looking stream_id validity check in avidec. 
Originally committed as revision 21642 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-05 11:50:44 +00:00
Michael Niedermayer
3c8d75e65b Only set duration for streams where it is likely correct. 
Fixes issue1120

Originally committed as revision 21620 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-03 00:35:10 +00:00
Michael Niedermayer
bce8840a4e Set nb_frames. 
Also add DXSA tag (commited by mistake in this commit, i can revert and recommit
seperately if someone wants)

Originally committed as revision 21619 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-02 23:53:38 +00:00
Carl Eugen Hoyos
0941ee0fa6 Support uncompressed ("Resolution 1:1") Avid AVI Codec, (partially) fixes issue 1474. 
Originally committed as revision 21154 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-12 00:29:26 +00:00
Michael Niedermayer
12ad66712a Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped 
arrays of fixed length.
Code from ffmbc with changes to adapt to our metadata API.

Originally committed as revision 20836 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 20:27:29 +00:00
Michael Niedermayer
df84d7d9bd Fix infinite loop with size==0 && sample_size!=0 in non interleaved avis. 
Untested, i do not have a sample.

Originally committed as revision 20348 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-22 18:43:08 +00:00
Michael Niedermayer
83a4d356ef Support non interleaved avi files that have 0<size<sample_size. 
(No i do not have a sample its thus also untested)
The new code is also simpler.

Originally committed as revision 20347 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-22 18:32:27 +00:00
Aurelien Jacobs
e471e3c4a5 Fix playback of strange AVI files with stray LIST. 
sample: http://samples.mplayerhq.hu/avi/AV36_1.AVI
fix suggested by Michael

Originally committed as revision 20118 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-01 10:24:02 +00:00
Maksym Veremeyenko
2c14ded386 Fix a bug with reading non-interleaved AVI if one the streams is 
shorter.

Patch by Maksym Veremeyenko, verem m1stereo tv

Originally committed as revision 19798 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-09 16:26:24 +00:00
Maksym Veremeyenko
b60de406a4 Factorise st->nb_index_entries check. 
Patch by Maksym Veremeyenko, verem m1stereo tv

Originally committed as revision 19797 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-09 16:25:12 +00:00
Reimar Döffinger
44ed34b790 Check for seek failures in avi_load_index, otherwise if the index offset 
is invalid (e.g. truncated file) we might end up reading the whole file
since trying to seek beyond the end of file does not set EOF.

Originally committed as revision 19709 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-26 08:38:44 +00:00
Maksym Veremeyenko
7305d97f04 Do not read index chunks as audio/video data; closes issue 1336. 
patch by Maksym Veremeyenko, verem m1stereo tv

Originally committed as revision 19700 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-25 09:46:16 +00:00
Aurelien Jacobs
7a9c86e9f8 avidec: simplify, using av_rescale_q() instead of av_rescale() 
Originally committed as revision 19624 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-10 20:53:32 +00:00
Diego Biurrun
18b55f639a Remove pointless '#ifdef DEBUG' around dprintf macro. 
Originally committed as revision 19535 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-29 17:12:47 +00:00
Måns Rullgård
63613fe615 Replace WORDS_BIGENDIAN with HAVE_BIGENDIAN 
Originally committed as revision 19508 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-26 12:20:04 +00:00
Reimar Döffinger
3dcddf82ed Check for failed extradata malloc, fixes a crash in out-of-memory conditions 
or with extremely large extradata.

Originally committed as revision 19333 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-03 11:27:52 +00:00
Reimar Döffinger
5a4a4d7839 Check size of "strf" header against size of enclosing "LIST" if there is one. 
Originally committed as revision 19332 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-03 11:26:14 +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
Michael Niedermayer
8c68f25b20 Workaround broken AVI files from DC-XZ6. 
Fixes issue897.

Originally committed as revision 18942 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-25 18:28:26 +00:00
Baptiste Coudurier
c13b250bad move DEBUG define before include to get dprintf and change printf to dprintf 
Originally committed as revision 18932 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-24 22:59:25 +00:00
Baptiste Coudurier
876578914b set avi fsize to INT64_MAX if riff tag end is not set and file size is not available 
Originally committed as revision 18052 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-19 21:57:14 +00:00
Michael Niedermayer
c60a0f85ee Check for alloc failures. 
Originally committed as revision 17497 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-21 20:57:46 +00:00
Michael Niedermayer
8ebe099ac0 Check for EOF during index reading. 
Originally committed as revision 17496 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-21 20:44:39 +00:00
Michael Niedermayer
f5007cc844 Handle chunks with the MSB in size set correctly that is unsigned. 
Originally committed as revision 17491 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-21 20:11:34 +00:00
Michael Niedermayer
31f2616db8 Fix raw rgb/bgr vertical flip in avi based on info from http://www.fourcc.org/fccbihgt.php. 
partially fixes issue862.

Originally committed as revision 17475 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-21 15:32:56 +00:00
Peter Ross
1e04bbeede AVI demuxer: return AVERROR_EOF upon detection of end of file. 
Originally committed as revision 17456 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-19 12:19:33 +00:00
Måns Rullgård
037c08d6cd avidec: fix error introduced in r17382 
Originally committed as revision 17385 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-16 18:52:14 +00:00
Benoit Fouet
87ad63c0f9 Add a context to av_log() calls and modify a function prototype to allow it. 
Originally committed as revision 17382 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-16 16:33:00 +00:00
Aurelien Jacobs
5ea7ce8843 modify the way to pass parameters to av_metadata_set() 
This improves code readability and this avoid warnings about discarding
qualifiers from pointer target type.

Originally committed as revision 16952 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-02 21:45:55 +00:00
Aurelien Jacobs
2bb6eba21d remove ff_get_fourcc() and use AV_RL32() instead 
Originally committed as revision 16654 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-17 12:21:01 +00:00
Marc Mason
9d9aac84f6 Make unsigned int a variable that does not need to be explicitely 32 bits. 
Fixes a warning.
Patch by: Marc Mason mpeg (your_ad_here) blue (chez) free fr

Originally committed as revision 16632 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-16 14:03:46 +00:00
Aurelien Jacobs
49fb20cb8a replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_ 
and remove all ENABLE_ definitions.

Originally committed as revision 16600 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-14 17:19:17 +00:00
Måns Rullgård
7b114c0925 AVI: add bswap.h include needed on big endian 
Originally committed as revision 16564 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-12 00:07:40 +00:00
Aurelien Jacobs
bc1d2afb37 rename AVMetaData to AVMetadata and meta_data to metadata 
Originally committed as revision 16430 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-04 23:31:31 +00:00
Michael Niedermayer
47146dfbf6 Generic metadata API. 
avi is updated as example.
No version bump, the API still might change slightly ...
No update to ffmpeg.c as requested by aurel.

Originally committed as revision 16424 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-04 18:48:37 +00:00
Michael Niedermayer
ca5b528ea1 Fix bug where the avi demxuer lost the first frame of malformed 
ODML avis.
Fixes VS2k5DebugDemo-01-partial.avi

Originally committed as revision 16167 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-16 16:14:07 +00:00
Michael Niedermayer
a3bb564ee5 10l (forgot sample_size) 
Should fix fate.

Originally committed as revision 16133 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-14 20:38:05 +00:00
Michael Niedermayer
25983dcd53 Fix non interleaved variable fps ODML avis. 
Fixed issue738

Originally committed as revision 16127 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-14 15:48:48 +00:00
Michael Niedermayer
7ccc636f03 Favor even chunk sizes in ambiguous cases. 
Fixes transcode_069_produces_uneven_chunk_size.avi.

Originally committed as revision 15557 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-04 22:26:43 +00:00
Michael Niedermayer
f080a7bd90 Factorize stream id parsing. 
Originally committed as revision 15556 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-04 21:57:01 +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
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
62f2523062 change assert test due to the new reducing of time_base in av_set_pts_info, fix #561 
Originally committed as revision 14477 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-30 21:07:54 +00:00
Diego Biurrun
15d6e3612f spelling cosmetics 
Originally committed as revision 14064 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-04 13:05:06 +00:00
Baptiste Coudurier
ade8d8b939 uniformize AVStream->priv_data freeing in av_close_input_stream 
Originally committed as revision 13838 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-20 17:22:56 +00:00
Baptiste Coudurier
ccafd47251 factorize read_header failure freeing code 
Originally committed as revision 13837 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-20 17:16:56 +00:00
Florian Echtler
25176d6e22 Parse 'dats' as data. 
Patch by Florian Echtler: floe butterbrot org

Originally committed as revision 13801 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-18 09:03:38 +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
Michael Niedermayer
fce88d52ca Fixes NULL pointer dereference CID66 
Originally committed as revision 13483 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-28 00:10:34 +00:00
Michael Niedermayer
9d4cd3bfd5 Tell the user if a AVI is non interleaved. 
Originally committed as revision 13482 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-28 00:07:41 +00:00
Diego Biurrun
f4433de9ef consistency cosmetics: indices --> indexes 
Originally committed as revision 13444 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-26 23:14:25 +00:00
Michael Niedermayer
2be83b96b6 Support non interleaved avi with phantom streams. 
Originally committed as revision 13436 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-26 20:29:16 +00:00
Michael Niedermayer
7ce76ee433 Print warning if scale/rate is invalid. 
Originally committed as revision 12806 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-13 11:45:18 +00:00
Michael Niedermayer
0dbb651564 indent 
Originally committed as revision 12805 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-13 11:41:45 +00:00
Michael Niedermayer
4a030a1fc7 Restructure if/else a little. 
Originally committed as revision 12804 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-13 11:41:09 +00:00
Michael Niedermayer
1ce50d32b7 indent 
Originally committed as revision 12618 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-28 03:50:40 +00:00
Michael Niedermayer
79d6b9cbd0 1000l to myself, dereferencing uninitalized pointer. 
Originally committed as revision 12614 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-28 02:44:44 +00:00
Michael Niedermayer
41757171e7 Support wb00+dc00 chunk mix. 
fixes issue402

Originally committed as revision 12609 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-27 20:58:01 +00:00
Michael Niedermayer
61559562f5 Fix aspect ratio. 
fixes issue404
avienc.c change by StevieS

Originally committed as revision 12601 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-27 01:18:16 +00:00
Michael Niedermayer
b7c407449b One non functional AVPalette chunk less, one heap overflow less. 
Fixes playback of CIMOVI01.avi.

Originally committed as revision 12517 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-20 16:29:18 +00:00
Michael Niedermayer
78db672cae Use block_align as the avi spec says. 
fix issue274

Originally committed as revision 12296 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-03 01:27:15 +00:00
Michael Niedermayer
143b082044 Print slightly more useful info. 
Originally committed as revision 12295 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-03 01:23:18 +00:00
Michael Niedermayer
c86ec2f4c3 Extract aspect ratio from ODML/vprp. 
Originally committed as revision 11365 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-01 22:05:51 +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
Vladimir Voroshilov
0b04ebb326 Add support for AMV variants of AVI files. 
patch by Vladimir Voroshilov, voroshil gmail com
Date: Sun, 30 Sep 2007 00:30:34 +0700
Subject: Re: [FFmpeg-devel] [PATCH] Demuxer for AMV files

Originally committed as revision 10623 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-29 22:47:34 +00:00
Aurelien Jacobs
b925ef61dd add support for AVI files with On2 header 
Originally committed as revision 10591 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-26 12:30:24 +00:00
Aurelien Jacobs
7b31b0929c use a table to parse AVI file header 
Originally committed as revision 10590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-26 12:29:32 +00:00
Michael Niedermayer
bc3a73bc87 remove broken movi_end skip-hack-check 
this should fix seeking over the first riff chunk in odml

Originally committed as revision 10114 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-14 03:00:56 +00:00
Michael Niedermayer
ea4b2b5e2c do not misuse movi_end for checking chunk sizes 
Originally committed as revision 10113 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-14 02:27:31 +00:00
Reimar Döffinger
cbb79c0ea8 Hack to support XSUB subtitles in AVI 
Originally committed as revision 9936 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-05 12:11:16 +00:00
Aurelien Jacobs
57004ff1d7 add an enum for need_parsing 
Originally committed as revision 8742 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-15 13:51:57 +00:00
Joakim Plate
a74008a4c3 timestamps generation improvement when parsing avi 
patch by Joakim \ elupus chez ecce dot se /
original thread:
date: 03/19/2007 01:47 AM
subject: [Ffmpeg-devel] [RFC] Improvement for the odd timestamp generation when parser is in use.

Originally committed as revision 8725 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-13 07:50:04 +00:00
Michael Niedermayer
87e8788680 allocate 32 extra bytes at the end of the probe buffer and remove most probe buf_size checks 
Originally committed as revision 8677 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-08 11:34:15 +00:00
Michael Niedermayer
755c18ae5d fix demuxing of broken MVI_3011.avi 
Originally committed as revision 8317 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-10 19:30:59 +00:00
Michael Niedermayer
6d29fba950 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count 
Originally committed as revision 7961 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-13 00:38:16 +00:00
Michael Niedermayer
d09ea618ed supporting files with A,V,I,0x19 header 
Originally committed as revision 7876 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-07 17:56:31 +00:00
Michael Niedermayer
4323b09d38 indent 
Originally committed as revision 7845 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-05 23:16:01 +00:00
Michael Niedermayer
ded3c7da61 dynamic index building so forward and backward seeking in avi without an index is possible 
Originally committed as revision 7842 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-05 23:06:08 +00:00
Michael Niedermayer
79a5b35c05 remove padding to 16bit code, i dont think this change can break anything and it makes the broken MPEG2-pub.avi from http://www.albx79.it/stuff/ playable other players arent that picky either ... 
Originally committed as revision 7670 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-23 18:37:23 +00:00
Diego Biurrun
db69c2e590 Make nb_streams unsigned to avoid an ugly cast. 
Originally committed as revision 7556 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-16 22:31:10 +00:00
Michael Niedermayer
c33fc0a540 fixing segfault with http://sam.zoy.org/zzuf/lol-ffplay.avi 
Originally committed as revision 7537 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-15 22:56:46 +00:00
Roman Shaposhnik
6eb2de748d * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>) 
Originally committed as revision 7439 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-11 22:32:19 +00:00
Diego Biurrun
5836d158b6 Fix misplaced comment. 
Originally committed as revision 7120 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-18 20:34:24 +00:00
Diego Biurrun
8662900b3b Clean up XAN DPCM hack and set codec_tag to 0 for XAN DPCM, AVI files 
with XAN DPCM audio (wrongly) declare PCM audio in the header.

Originally committed as revision 7119 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-18 17:37:56 +00:00
Michael Niedermayer
2b70eb2bed fix support for avis with sample_size > packet size 
Originally committed as revision 7110 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-16 23:36:54 +00:00
Aurelien Jacobs
38ca53dae9 cosmetic: fix indentation after previous commit 
Originally committed as revision 6987 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-12 16:36:14 +00:00
Aurelien Jacobs
a2a6332b56 Fix avidec.c compilation when dv demuxer is disabled. 
Originally committed as revision 6986 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-12 16:35:19 +00:00
Baptiste Coudurier
cbee7a6944 get rid of CODEC_ID_MPEG4AAC after next version bump, and change it to CODEC_ID_AAC where used 
Originally committed as revision 6954 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-09 11:37:30 +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
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
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
Panagiotis Issaris
2ad4648f97 Allow to get the the track number in the IPRT (part) tag in AVI. 
Patch by Panagiotis Issaris % takis P issaris A uhasselt P be %
Original thread:
Date: Sep 6, 2006 6:00 PM
Subject: [Ffmpeg-devel] [PATCH] Enable track tag in AVI

Originally committed as revision 6190 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-07 16:35:22 +00:00
Panagiotis Issaris
f0861f466f Better tag support: 
- Make ffplay show comments and copyright info besides the current track, title, author, album, year and genre.
- Makes the AVI demuxer parse the album name stores in the IPRD tag by the AVI muxer.
Patch by takis P issaris A uhasselt P be
Original thread:
[Ffmpeg-devel] [PATCH] Better tag support
Date: 09/06/06 16:58

Originally committed as revision 6186 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-07 08:09:15 +00:00
Michael Niedermayer
2c00106c2b ignore index parameter to ignore the ODML index in avi 
Originally committed as revision 6177 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-05 19:23:32 +00:00
David Conrad
2064c77ab9 Fix for AVI files with odd sized 'movi' list 
Patch by David Conrad <davedc_@umbc.edu>
Original thread:
Date: Wed, 30 Aug 2006 15:12:35 -0400
Subject: [Ffmpeg-devel] [PATCH] Fix for AVI files with odd sized 'movi' list

Originally committed as revision 6140 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-31 09:43:29 +00:00
Michael Niedermayer
965a63af2b support some totally broken ODML variant 
Originally committed as revision 6091 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-25 20:50:18 +00:00
David Conrad
57060f8936 AVI tag reading and writing patch by David Conrad. 
umovimus at gmail dot com

Originally committed as revision 6022 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-18 16:48:35 +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
Måns Rullgård
26b891356c kill warnings 
Originally committed as revision 5586 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-02 19:35:07 +00:00
Måns Rullgård
a5e9102b4b free codec extradata in av_close_input_file 
Originally committed as revision 5484 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-06-16 07:54:37 +00:00
Michael Niedermayer
b7b225581f dont load the index if we cant seek back 
Originally committed as revision 5475 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-06-14 00:32:10 +00:00
Kostya Shishkov
1c6606e2d0 Fix demuxing of AVIs with pad streams. 
Originally committed as revision 5271 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-04-06 03:33:10 +00:00
Michael Niedermayer
b72a2bc82f dwstart support 
Originally committed as revision 5097 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-03-02 14:50:31 +00:00
Michael Niedermayer
e84dab5f57 fixing demuxing of minorityreport.AVI 
Originally committed as revision 5096 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-03-02 14:27:41 +00:00
Michael Niedermayer
8945ebb9c1 fixing av sync in videotest.avi (index doesnt match chunks, header doesnt indicate that) 
Originally committed as revision 5088 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-03-01 16:11:04 +00:00
Michael Niedermayer
115e8ae577 support seeking in RenderAvi.avi (audio stream == single huge chunk) 
Originally committed as revision 5087 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-03-01 15:42:07 +00:00
Michael Niedermayer
8223bca50d 10l forgot to set packet_size 
Originally committed as revision 5086 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-03-01 15:21:53 +00:00
Michael Niedermayer
1894edeb74 fix demuxing of XviD_with_3_AAC-HE_audio_streams.avi 
Originally committed as revision 5085 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-03-01 12:04:22 +00:00
Michael Niedermayer
5c89153e90 add movi_list offset into index 
Originally committed as revision 5084 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-03-01 11:41:16 +00:00
Michael Niedermayer
30a43f2d09 add size to AVIndex 
Originally committed as revision 5083 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-03-01 11:29:55 +00:00
Michael Niedermayer
94d1d6c02d ODML index parsing support 
Originally committed as revision 5081 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-03-01 01:32:32 +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
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
7cbaa7bafa parse pict_type for streams in avi 
fix mpeg4 parser so it outputs te pict_type
support header only parseing without repacking

Originally committed as revision 4527 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-08-15 15:58:21 +00:00