Thierry Foucu
45faf7fcd3
nsv: Fix misdetection of MP3 files as NSV.
...
If an MP3 file contains the string NSVs, the NSV probe will confuse it for an
NSV file. Check for 0xBEEF after a Video/Audio chunk to achieve more accuracy.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-05-12 11:32:39 +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
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
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
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
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
Maksym Veremeyenko
c4461aa83c
fix nsvdec.c compilation if DEBUG macro defined
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 41cdc1ff1e
)
2011-02-16 23:00:50 +01:00
Maksym Veremeyenko
41cdc1ff1e
fix nsvdec.c compilation if DEBUG macro defined
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-16 07:33:25 -05:00
Maksym Veremeyenko
73b3b52285
fix nsvdec.c compilation if DEBUG defined
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit d06497f316
)
2011-02-15 16:32:33 +01:00
Maksym Veremeyenko
d06497f316
fix nsvdec.c compilation if DEBUG defined
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-15 09:15:43 -05: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
Stefano Sabatini
2ef6c1242a
Mark av_metadata_set() as deprecated, and use av_metadata_set2()
...
in its place.
av_metadata_set() is going to be dropped at the next major bump.
Originally committed as revision 22961 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-25 14:27:42 +00:00
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
Jai Menon
1f6d0d42c5
Plug memory leak in NSV demuxer.
...
Patch by Jai Menon.
Originally committed as revision 22173 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-03 17:26:00 +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
Carl Eugen Hoyos
bc2d2a07d5
Make AVCodecTag.id enum CodecID and use CODEC_ID_NONE instead of 0.
...
Originally committed as revision 20250 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-16 14:46:06 +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
Jai Menon
4fabb60ddb
NSV : Add TOC2 parsing and seeking support.
...
Originally committed as revision 18662 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-22 19:37:57 +00:00
Jai Menon
a00f440f37
Cosmetics : reindent after last commit and remove redundant comment.
...
Originally committed as revision 18605 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-18 08:35:46 +00:00
Jai Menon
d6ce84b8f9
Add speex tag to nsv_codec_audio_tags.
...
Originally committed as revision 18604 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-18 08:34:15 +00:00
Jai Menon
67d04927f7
Change nsvf_index_data to nsvs_file_offset for increased clarity.
...
Originally committed as revision 18603 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-18 05:54:47 +00:00
Aurelien Jacobs
a233eaa618
use new metadata API in nsv demuxer
...
Originally committed as revision 17407 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-18 00:02:38 +00:00
Diego Biurrun
517ac2434b
Use more descriptive format long_names.
...
Originally committed as revision 17184 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-12 17:26:06 +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
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
Michael Niedermayer
2615800a27
Try to fix FATE after my time_base simplification change.
...
Originally committed as revision 14262 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-17 14:13:44 +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
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
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
Michael Niedermayer
fffd6a5fe0
indent
...
Originally committed as revision 10545 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-22 08:58:49 +00:00
Michael Niedermayer
638f489ccd
fix segfault with http://samples.mplayerhq.hu/nsv/nsv_samples/ot171_novideo.nsv.bz2
...
bug introduced in r8466
closes issue179
Originally committed as revision 10544 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-22 08:55: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
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
Michael Niedermayer
ac5565d88c
file extension based probe is max/2
...
Originally committed as revision 8679 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-08 11:37:43 +00:00
Michael Niedermayer
65a00bd65a
factorize
...
Originally committed as revision 8678 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-08 11:37: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
David Conrad
8076609a40
The NSV demuxer assumes that a video frame's timestamp increases by one on each
...
frame, but some low-bitrate NSV files omit video frames for some NSV frames,
and expect the timestamp to increase by one every NSV frame. This is noticeable
in 64vp3.nsv where the video runs several times faster than the audio. Fix this
by unconditionally incrementing the video's timestamp with each NSV frame.
patch by David Conrad, umovimus gmail com
Originally committed as revision 8466 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-21 11:05:35 +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
Aurelien Jacobs
9110a0e32d
Add support for VP60 and VP61.
...
Originally committed as revision 7329 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-17 22:00:12 +00:00
Joakim Plate
0a4250bc92
add support for all framerates specified by the standard
...
Patch by Joakim elupus A ecce P se
Original thread:
Date: Oct 28, 2006 7:56 PM
Subject: [Ffmpeg-devel] [PATCH] Support for all official framerates in nsv demuxer
Originally committed as revision 6828 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-28 18:39:16 +00:00
Joakim Plate
2f394e1ca8
Fix A/V (de)sync with discontinuous NSV streams,
...
Patch by Joakim elupus A ecce P se
Original thread:
Subject: [Ffmpeg-devel] [PATCH]: A/V sync on nsv streams.
Date: October 27, 2006 3:18:54 AM CEDT
Actual committed patch:
Date: October 28, 2006 3:23:28 AM CEDT
Originally committed as revision 6826 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-28 17:28:04 +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
Baptiste Coudurier
14f283d849
disable annoying debug messages
...
Originally committed as revision 6758 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-22 14:14:36 +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
Aurelien Jacobs
5ce117c37c
VP5 and VP6 video decoder
...
Originally committed as revision 6213 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-09 17:19:37 +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
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
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
4733abcbf3
use PRIxN, %zd, %td formats where needed
...
Originally committed as revision 4740 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-12 01:56:46 +00:00
Måns Rullgård
bf4e3bd2d0
kill a bunch of compiler warnings
...
Originally committed as revision 4522 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-08-14 15:42:40 +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
2692067a45
AVPacket.pos
...
Originally committed as revision 4314 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-26 20:17:12 +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
c8389233cb
fix useless framerate messup
...
Originally committed as revision 4167 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-04-26 21:46:46 +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
Michael Niedermayer
568e18b15e
integer overflows, heap corruption
...
possible arbitrary code execution cannot be ruled out in some cases
precautionary checks
Originally committed as revision 3813 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-08 14:21:33 +00:00
Michael Niedermayer
61f4aa96ba
kill a annoying debug printf
...
Originally committed as revision 3725 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-30 21:57:51 +00:00
Mike Melanson
e4917f59a5
use correct types
...
Originally committed as revision 3698 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-20 23:53:24 +00:00
François Revol
27d5f18f66
First implementation of nsv demuxer.
...
Get libavformat linked with lavc and lmp3lame is required. BeOS requires no undefined syms on link! (besides it's bad to leave undef syms)
Originally committed as revision 3696 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-20 23:10:07 +00:00