generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
23,205 Commits 24 Branches 241 Tags 173 MiB
732436920b
Commit Graph

23205 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefano Sabatini
912dd63ecb Cosmetics: replace "filename" to "arg" for the name of the argument of 
opt_input_file(). More consistent and more clear, as "filename" can be
easily confused with the global "input_filename".

Originally committed as revision 22045 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-25 00:05:01 +00:00
Alex Converse
c4a90caae2 aac: Keep decode_band_types() from eating all padding at the end of a buffer. 
Due to a shortcoming in the AAC specification, if an all zero buffer is
fed to section data decoding it will never terminate. That means without
a buffer exhaustion check decode_band_types() will consume all input
buffer padding. Worse if a get_bits() implementation that returns zeros
when padding is exhausted is used, the function will never terminate.

The fixes that by added a buffer exhaustion check in the sectioning
decoding loop.

Originally committed as revision 22044 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 23:56:52 +00:00
Stefano Sabatini
3314799368 Extend doxy for the src parameter of av_fifo_generic_write(). 
@patchby Tomas Härdin |tomas dot hardin at codemill dot se|

Originally committed as revision 22043 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 23:52:52 +00:00
Michael Niedermayer
09ef1ace4b 3rd and hopefully last 100l fix. 
Originally committed as revision 22041 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 22:13:20 +00:00
Michael Niedermayer
3393bff10d Fix doxy and assert(). 
Originally committed as revision 22040 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 22:05:51 +00:00
Michael Niedermayer
377fc38d5d Try to fix 100l compilation failure on some systems. 
Originally committed as revision 22039 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 21:55:55 +00:00
Michael Niedermayer
b5bd070029 Change mvd_cache & mvd_table to 8bit, this is overall a bit faster 
for high resolution videos.
about 20cycles faster per MB for cathederal.

Originally committed as revision 22038 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 20:43:06 +00:00
Michael Niedermayer
8ef4e65e94 AV_COPY16() & AV_ZERO16() 
Originally committed as revision 22037 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 20:38:31 +00:00
Michael Niedermayer
f3ea29bfa3 Extend fill_rectangle() support for 16bit 
Originally committed as revision 22036 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 20:37:58 +00:00
Michael Niedermayer
81b5e4ee92 Calculate mvd without abs() 
same speed (ask gcc why, i dont know)

Originally committed as revision 22035 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 18:50:02 +00:00
Anton Khirnov
fce4448948 Read ASF metadata as proper UTF-16 and spit it out as proper UTF-8 in our 
metadata system.

Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 22034 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 18:19:54 +00:00
Anton Khirnov
a106d4112d Don't add WM prefixes to all written ASF tags. 
Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 22033 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 18:17:32 +00:00
Michael Niedermayer
855a1ba5e8 switch back to (amvd>2)+(amvd>32), its 5 cpu cycles faster now. 
Originally committed as revision 22032 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 18:16:48 +00:00
Anton Khirnov
531d8fa308 Eliminate put_str16(). 
Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 22031 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 18:09:49 +00:00
Anton Khirnov
ae529ddb32 Add PUT_UTF16() macro. 
Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 22030 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 18:08:30 +00:00
Michael Niedermayer
01b35be14a Factorize common code from the top of decode_cabac_mb_mvd() 
10-15 cpu cycles faster.

Originally committed as revision 22029 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 18:06:02 +00:00
Anton Khirnov
6164842300 Mention that metadata tags are (unvalidated) UTF-8. 
Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 22028 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 18:01:44 +00:00
Michael Niedermayer
6d0155c79c Replace mvd>2 + mvd>32 by MIN((mvd+28)*17>>9, 2) 
same speed as far as i can meassure but it might have fewer branches on some
archs.
Idea from x264 / jason

Originally committed as revision 22027 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 16:16:08 +00:00
Ramiro Polla
bc77fce6ba Clear freed pointer in ffplay.c. 
Fixes a crash when audio stream is cycled twice.

Originally committed as revision 22026 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 14:45:18 +00:00
Michael Niedermayer
90332debfe Replace ad-hoc fill rectangle by fill_rectangle(). 
Originally committed as revision 22025 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 13:12:09 +00:00
Kostya Shishkov
d2df291f73 ff_msmpeg4_decode_init() calls ff_h263_decode_init() which calls 
MPV_common_init(), so calling both is redundant and leads to memory
leaks in WMV3/VC-1 decoder. Thus use only the first function in
WMV3/VC-1 decoder initialization.

Originally committed as revision 22024 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 13:11:38 +00:00
Peter Ross
601e74d366 it is not necessary to display the decoder name, as av_log() automatically prints the context 
Originally committed as revision 22023 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 11:51:42 +00:00
Peter Ross
dd80be5bfc low-complexity Bink file seeking 
Originally committed as revision 22022 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 11:43:33 +00:00
Peter Ross
7e276c85b1 set AVINDEX_KEYFRAME correctly for bink 
Originally committed as revision 22021 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 11:30:38 +00:00
Yann Coupin
8d819221db Correctly increment continuity_counter in PCR packets. 
Patch by Yann Coupin, yann.coupin+ffmpeg gmail

Originally committed as revision 22020 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 10:56:13 +00:00
Benoit Fouet
6538c0f1c6 asfdec: skip byte array tags. 
Patch from Anton Khirnov wyskas gmail

Originally committed as revision 22019 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 07:34:12 +00:00
Benoit Fouet
27e7492771 asfdec: add a debug message about skipped tags. 
Patch from Anton Khirnov wyskas gmail

Originally committed as revision 22018 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 07:33:18 +00:00
Benoit Fouet
47794b9d3e asfdec: fix a memleak. 
Patch from Anton Khirnov wyskas gmail

Originally committed as revision 22017 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 07:32:20 +00:00
Benoit Fouet
514b73cf0d asfdec: only unicode tags must have even length. 
Patch from: Anton Khirnov wyskas gmail

Originally committed as revision 22016 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 07:31:03 +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
Ramiro Polla
c8c0ac6b26 FFprobe: take only one input file. 
Originally committed as revision 22014 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 06:14:59 +00:00
Michael Niedermayer
9127a369ad Replace /2 by faster >>1 as the mvd values are now all positive. 
Originally committed as revision 22013 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 01:57:31 +00:00
Michael Niedermayer
5c34e36a23 Remove unused variable. Seems i forgot to commit this. 
Originally committed as revision 22012 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 01:56:27 +00:00
Michael Niedermayer
a15fdd7ce3 Attempt to fix issue1728 and regression of issue203 
Originally committed as revision 22011 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 23:41:11 +00:00
Michael Niedermayer
b8c93c483b Set ist->pts to something that isnt guranteed to entangle itself with stream copying b frames. 
Originally committed as revision 22010 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 22:06:36 +00:00
Diego Biurrun
fc298fd9be Add -Wmissing-prototypes to CFLAGS if available. 
Originally committed as revision 22009 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 21:03:25 +00:00
Michael Niedermayer
9f7490a09c Also favor streams with more packets in ffplay. 
Originally committed as revision 22008 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 17:35:44 +00:00
Michael Niedermayer
256ab3ed9d Dont modify wanted_stream. 
Originally committed as revision 22007 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 17:09:53 +00:00
Michael Niedermayer
5b369983c6 replace wanted_*_stream by wanted_stream[CODEC_TYPE] 
Originally committed as revision 22006 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 16:56:23 +00:00
Jai Menon
8790961d7e mlp_parser: Fix memleak. 
ff_combine_frame() is called, which allocates ParseContext->buffer if needed,
so ff_parse_close() must be called to free it.
Patch by jai.

Originally committed as revision 22005 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 16:54:05 +00:00
Nash Tsai
d7a4961e53 vfwcap: support MJPG compressed streams. 
Patch by Nash Tsai <nash dot tsai at gmail dot com>

Originally committed as revision 22004 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 16:49:16 +00:00
Ramiro Polla
f1d5a1f285 Reorder buffer debug. Also print out if slice was buffered. 
Originally committed as revision 30722 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-02-23 16:46:43 +00:00
Michael Niedermayer
6625a3de2a Replace *_index by st_index[codec_type]. 
Originally committed as revision 22003 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 16:46:40 +00:00
Michael Niedermayer
247e3954fc Favor streams with more packets if the user did not specify what she wants. 
Fixes issue1156

Originally committed as revision 22002 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 16:31:14 +00:00
Michael Niedermayer
ab392695d5 Count all frames with codec_info_nb_frames not just ones with non zero 
duration. I hope this breaks nothing. Its needed for my fix of issue1156

Originally committed as revision 22001 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 16:29:57 +00:00
Daniel Verkamp
d962706f96 Cosmetics: break all Makefile lines at 80 columns or less 
Originally committed as revision 22000 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 16:12:30 +00:00
Michael Niedermayer
6d3d3b836f Redesign opt_programid code. 
Its now possible to also select programs per input file and there is
less code duplication.

Originally committed as revision 21999 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 15:08:41 +00:00
Michael Niedermayer
6c6e6ef5e2 Put codec_info_nb_frames back in AVStream and print its value. 
This way streams with no or very few frames can be avoided during
auto selection

Originally committed as revision 21998 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 15:07:18 +00:00
Michael Niedermayer
fc323a5480 Clarify non constness of src in av_fifo_generic_write() 
Originally committed as revision 21997 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 12:14:13 +00:00
Peter Ross
02cd6f5426 Set video stream duration for Bink demuxer 
Originally committed as revision 21996 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 11:15:18 +00:00