MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
115,042 Commits 4 Branches 0 Tags 195 MiB
master
Commit Graph

287 Commits

Author SHA1 Message Date
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
Måns Rullgård
e6b22522c9 bswap: change ME to NE in macro names 
Other parts of FFmpeg use NE (native endian) rather than ME (machine).
This makes it consistent.

Originally committed as revision 24169 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-10 22:09:01 +00:00
Eli Friedman
a07a06b033 Fix warning "passing argument from incompatible pointer type". 
Patch by Eli Friedman, eli d friedman a gmail

Originally committed as revision 24020 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-03 10:25:32 +00:00
Stefano Sabatini
49837b8d24 Make the nut decoder read the ff_nut_video_tags to detect codec id of 
the input file.

This is required as Nut codec tags are not contained in
ff_codec_bmp_tags.

Originally committed as revision 23260 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-23 18:34:18 +00:00
Stefano Sabatini
2e01def0fe Define ff_nut_video_tags and make Nut muxer and demuxer set it in 
codec_tag.

Originally committed as revision 23259 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-23 18:34:15 +00:00
Stefano Sabatini
8e89cd1fee Make the nut demuxer issue a more meaningful error message if it 
cannot recognize the provided codec tag.

Originally committed as revision 23071 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-09 22:56:02 +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
Benoit Fouet
32e543f866 Replace @returns by @return. 
Originally committed as revision 22729 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-30 15:50:57 +00:00
Vitor Sessak
f990f6e3f7 Fix NUT (de)muxer warnings: 
CC    libavformat/nutdec.o
libavformat/nutdec.c: In function ‘read_seek’:
libavformat/nutdec.c:862: warning: passing argument 3 of ‘av_tree_find’ from incompatible pointer type
./libavutil/tree.h:44: note: expected ‘int (*)(void *, const void *)’ but argument is of type ‘int (*)(struct Syncpoint *, struct Syncpoint *)’
libavformat/nutdec.c:871: warning: passing argument 3 of ‘av_tree_find’ from incompatible pointer type
./libavutil/tree.h:44: note: expected ‘int (*)(void *, const void *)’ but argument is of type ‘int (*)(struct Syncpoint *, struct Syncpoint *)’
libavformat/nutdec.c:879: warning: passing argument 3 of ‘av_tree_find’ from incompatible pointer type
./libavutil/tree.h:44: note: expected ‘int (*)(void *, const void *)’ but argument is of type ‘int (*)(struct Syncpoint *, struct Syncpoint *)’
CC    libavformat/nutenc.o
libavformat/nutenc.c: In function ‘write_packet’:
libavformat/nutenc.c:680: warning: passing argument 3 of ‘av_tree_find’ from incompatible pointer type
./libavutil/tree.h:44: note: expected ‘int (*)(void *, const void *)’ but argument is of type ‘int (*)(struct Syncpoint *, struct Syncpoint *)’

Originally committed as revision 22707 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-28 09:59:58 +00:00
Vitor Sessak
3bfb30b9e3 Fix warnings in NUT demuxer: 
libavformat/nutdec.c: In function ‘read_seek’:
libavformat/nutdec.c:862: warning: passing argument 4 of ‘av_tree_find’ from incompatible pointer type
./libavutil/tree.h:44: note: expected ‘void **’ but argument is of type ‘struct Syncpoint **’
libavformat/nutdec.c:871: warning: passing argument 4 of ‘av_tree_find’ from incompatible pointer type
./libavutil/tree.h:44: note: expected ‘void **’ but argument is of type ‘struct Syncpoint **’

Originally committed as revision 22662 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-24 22:44:06 +00:00
Vitor Sessak
4b83fc0fe4 Plug memory leak in NUT muxer and demuxer 
Originally committed as revision 22174 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-03 17:31:24 +00:00
Vitor Sessak
8a4d067dfc Revert r22119 and partially revert 22120. 
Originally committed as revision 22135 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-01 18:16:10 +00:00
Anton Khirnov
e1c0b00b06 nutdec: make chapter start and length uint64_t to prevent overflows. 
Patch by Anton Khirnov wyskas chez gmail punto com

Originally committed as revision 22127 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-01 07:26:41 +00:00
Vitor Sessak
27dbc47c05 Plug some memory leaks in NUT muxer and demuxer 
Originally committed as revision 22120 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-28 20:49:21 +00:00
Anton Khirnov
43382b5f13 Introduce metadata conversion table for NUT muxer and demuxer. 
Patch by Anton Khirnov (wyskas, do no evil mail)
Thread "[PATCH] nut metadata conversion table"

Originally committed as revision 22015 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 06:27:12 +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
Aurelien Jacobs
00798e4563 use new metadata API in nut demuxer 
Originally committed as revision 17652 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-27 23:10:34 +00:00
Aurelien Jacobs
9ce6c13879 export gcd function as av_gcd() 
Originally committed as revision 16653 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-17 11:13:33 +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
Diego Biurrun
6a5d31ac25 Fix build: Add intreadwrite.h and bswap.h #includes where necessary. 
Originally committed as revision 16556 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 22:19:48 +00:00
Michael Niedermayer
52afa376b8 remove _t for POSIX compatibility. 
Originally committed as revision 16057 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-11 19:06:24 +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
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
c2a3dcaf25 Fix memleak, fixed CID123. 
Originally committed as revision 13472 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-27 20:48:27 +00:00
Michael Niedermayer
abd2256dbe Pass time_base as argument to new_chapter() as well. 
This fixes the wrong timebase the matroska demuxer had after my previous commits.
Maybe we should reduce new_chapter() to just (AVFormatContext, int id) ?

Originally committed as revision 13266 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 18:15:13 +00:00
Michael Niedermayer
883fe4d5bb Chapter demuxing support. (untested as I have no nuts with chapters) 
Isn't that much simpler than Matroska?

Originally committed as revision 13263 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 13:52:54 +00:00
Diego Biurrun
245976da2a Use full path for #includes from another directory. 
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-09 11:56:36 +00:00
Diego Pettenò
d6f142a1f8 Fix 'comparison always false' warning. 
patch by Diego 'Flameeyes' Pettenò, flameeyes gmail com

Originally committed as revision 13056 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-04 10:29:12 +00:00
Diego Biurrun
bd10713636 typo fixes 
Originally committed as revision 12449 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-15 16:15:47 +00:00
Diego Biurrun
2cab640129 typo fixes 
Originally committed as revision 12428 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-12 23:58:46 +00:00
Evgeniy Stepanov
90c2295b24 Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing 
of matroska and nut.

Originally committed as revision 12358 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-07 19:25:09 +00:00
Michael Niedermayer
1326621c1a Subtitle support. (untested) 
Originally committed as revision 12330 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-05 13:06:49 +00:00
Michael Niedermayer
9fdfd21c77 factorize 
Originally committed as revision 12293 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-02 23:13:07 +00:00
Michael Niedermayer
a048febdc4 subtitles (codec tag tables still missing ...) 
Originally committed as revision 12292 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-02 23:11:36 +00:00
Michael Niedermayer
3b4f69ae8c Elision header demuxing support. 
Originally committed as revision 11935 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-15 02:36:09 +00:00
Michael Niedermayer
7eeebcc5de Read match time delta in the frame header. 
We do not do anything with it as lavf does not really support it yet.

Originally committed as revision 11931 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-13 20:17:28 +00:00
Michael Niedermayer
6cb4b28fea Read match_time_delta in the framecode table. 
Originally committed as revision 11930 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-13 20:13:29 +00:00
Diego Biurrun
5e53486545 typo fix: inited --> initialized 
Originally committed as revision 11920 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-13 09:26:10 +00:00
Oded Shimon
eae213af43 Remove old workaround in nutdec.c for libnut bug 
Originally committed as revision 11853 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-04 10:30:38 +00:00
Oded Shimon
b19e3983cf missing " && j<syncpoint_count" protection in the index parsing, as the 
spec instructs...

Originally committed as revision 11852 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-04 10:29:03 +00:00
Oded Shimon
103d74ea5c ff_nut_reset_ts() expected to get 'ts*time_base_count', but muxer only 
gave it 'ts'. Fixed by changing ff_nut_reset_ts() and demuxer params

Originally committed as revision 11851 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-04 10:27:32 +00:00
Michael Niedermayer
0fca8bc835 Fix info packet type, found by oded as well as the new pedantic const 
warnings.

Originally committed as revision 11843 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-04 00:33:52 +00:00
Michael Niedermayer
7ebab67901 -Wwrite-strings nitpicking fix 
Originally committed as revision 11842 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-04 00:31:31 +00:00
Michael Niedermayer
3858a227ce More verbose aspect ratio error msg. 
Originally committed as revision 11362 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-31 16:43:35 +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
Kostya Shishkov
7798b42df1 Add ff_ prefix to get_v() 
Originally committed as revision 10912 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-03 18:29:16 +00:00
Kostya Shishkov
897d3eef4c Make get_v() available to the other demuxers 
Originally committed as revision 10911 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-03 18:26:42 +00:00
Baptiste Coudurier
992e78f5f2 rename av_crc04C11DB7_update to ff_crc04C11DB7_update and move it to aviobuf.c so it can be reused by other (de)muxers 
Originally committed as revision 10873 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-30 00:01:25 +00:00
Diego Biurrun
0ab1ebea31 warning fix: 
nutdec.c: In function ‘nut_read_timestamp’:
nutdec.c:759: warning: label ‘resync’ defined but not used

Originally committed as revision 10506 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-16 14:37:01 +00:00
Diego Biurrun
30a987ece9 Remove unused variable. 
Originally committed as revision 10251 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-27 12:36:19 +00:00
Diego Biurrun
93951943ec spelling/wording cosmetics 
Originally committed as revision 10131 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-17 10:45:50 +00:00
Michael Niedermayer
4a3b5fe16a move syncpoint cache related stuff to common file 
Originally committed as revision 10038 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-09 23:24:02 +00:00
Michael Niedermayer
073811cdd2 fix forw_ptr crc check 
not really beautiful but i did not find a nice solution
note, untested

Originally committed as revision 10037 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-09 21:35:13 +00:00
Michael Niedermayer
7a26da44b0 get rid of printf 
Originally committed as revision 10033 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-09 21:04:10 +00:00
Michael Niedermayer
f13ea4e00c move lsb2full to common file 
Originally committed as revision 10025 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-09 18:37:28 +00:00
Michael Niedermayer
874abace12 move syncpoint timestamp resetting code to a common file 
Originally committed as revision 10020 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-09 16:29:30 +00:00
Michael Niedermayer
47772399ec check forw_ptr CRC 
Originally committed as revision 10017 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-09 12:51:08 +00:00
Michael Niedermayer
efd8f22a16 make StreamContext.time_base a pointer 
Originally committed as revision 10010 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-09 11:04:43 +00:00
Panagiotis Issaris
769e10f068 Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM). 
Originally committed as revision 9759 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-19 15:21:30 +00:00
Måns Rullgård
99a452342c nutdec: don't use deprecated codec_get_{bmp,wav}_id() 
Originally committed as revision 9528 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-08 01:41:07 +00:00
Diego Biurrun
e5a389a1b7 license header consistency cosmetics 
Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-05 10:40:25 +00:00
Måns Rullgård
75e61b0e88 use new string functions 
based on patch by Reimar Döffinger

Originally committed as revision 9401 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-23 23:10:32 +00:00
Måns Rullgård
706da4af32 fix some printf format specifiers 
Originally committed as revision 9334 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-16 14:52:05 +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
Diego Biurrun
a47ec310f2 Remove unused code + variable, fixes a warning. 
Originally committed as revision 8794 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-24 05:50:30 +00:00
Stefan Huehner
119e48d960 Make some functions which aren't used outside their declaring source file 
and have no prototype in a header file static.
patch by Stefan Huehner, stefan huehner org

Originally committed as revision 8686 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-08 20:21:11 +00:00
Clemens Ladisch
559fd1e795 fix end-of-file detection 
At the end of a nut file, the check for url_feof() fails because the
eof flag was cleared by the url_fseek() call that was used to skip over
the index packet.    This patch fixes this
patch by: Clemens Ladisch % cladisch A fastmail P net %
Original thread:
Date: Feb 27, 2007 6:13 PM
Subject: [Ffmpeg-devel] [PATCH] nutdec: fix end-of-file detection

Originally committed as revision 8447 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-18 23:59:56 +00:00
Luca Barbato
bb0eb714bd get_packetheader() forgot to read the header_checksum in big packets 
patch from Clemens Ladisch cladisch AT fastmail dot net
(stray base64 patch reverted in the next commits)

Originally committed as revision 8156 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-28 03:28:31 +00:00
Michael Niedermayer
07495657fb simplify 
Originally committed as revision 7602 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-21 12:43:29 +00:00
Michael Niedermayer
06599638dd check max_pts_distance 
Originally committed as revision 7100 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-16 11:03:40 +00:00
Michael Niedermayer
0a3b575bc7 skip non keyframes after seeking between syncpoint and the first keyframe 
Originally committed as revision 7099 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-16 10:20:29 +00:00
Michael Niedermayer
c873bc17bf remove unused variables 
Originally committed as revision 7098 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-16 09:59:46 +00:00
Michael Niedermayer
09e151848a removing unused code 
Originally committed as revision 7096 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-16 09:56:04 +00:00
Michael Niedermayer
2dbe0bd45f check for frames with 2*size > max_dist and no crc 
Originally committed as revision 7076 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-14 22:24:10 +00:00
Michael Niedermayer
8ba3e5d843 resync from last syncpoint 
Originally committed as revision 7075 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-14 22:23:26 +00:00
Michael Niedermayer
a26353e211 remove skip spam 
Originally committed as revision 7074 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-14 22:22:53 +00:00
Michael Niedermayer
f32554fa62 indention 
Originally committed as revision 7058 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-14 13:33:05 +00:00
Michael Niedermayer
071790c876 seeking with index 
Originally committed as revision 7057 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-14 13:32:14 +00:00
Michael Niedermayer
4d5be986f0 index less seeking in O(log n) time 
Originally committed as revision 7056 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-14 13:19:51 +00:00
Michael Niedermayer
5d97d9d53e fix checksum check (was my bug not libnut) 
Originally committed as revision 6980 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-12 12:16:59 +00:00
Michael Niedermayer
e827202955 fix timestamp rounding in syncpoints 
index reading (unfinished and disabled)

Originally committed as revision 6979 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-12 12:07:42 +00:00
Michael Niedermayer
7b0d75fc40 simplify 
Originally committed as revision 6971 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-11 19:47:58 +00:00
Michael Niedermayer
9a626982f9 dont do startcode search from last syncpoint if there are no errors 
Originally committed as revision 6969 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-11 19:43:55 +00:00
Michael Niedermayer
faf7cbf110 nut simple seeking first try 
Originally committed as revision 6968 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-11 19:37:21 +00:00
Michael Niedermayer
619d8e2e58 updating nut demuxer to latest spec 
no muxing yet
no index yet
no seeking yet
libnuts crcs dont match mine (didnt investigate yet)
samplerate is stored wrong by libnut (demuxer has a workaround)
code is not clean or beautifull yet, but i thought its better to commit early before someone unneccesarily wastes his time duplicating the work
demuxer split from muxer

Originally committed as revision 6966 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-11 01:35:50 +00:00