har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,213 Commits 2 Branches 401 Tags
Commit Graph

369 Commits

Author SHA1 Message Date
Ramiro Polla
fc9c2d53c3 Merge declaration and initialization. 
Originally committed as revision 13672 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-06 16:53:01 +00:00
Aurelien Jacobs
ca162a5004 Ensure the first audio stream is selected as the default stream 
when no video stream is present.

Originally committed as revision 13648 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-03 15:19:43 +00:00
Michael Niedermayer
820ad60cd9 Make update_initial_durations() also work if a dts occured before a 
sequence header (that is a few known dts/pts but no known durations
previously)
cnnts1.mpg is one sample affected by this.

Originally committed as revision 13640 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-03 00:50:22 +00:00
Michael Niedermayer
5853423c3f Do not set pts in update_initial_durations() if stream has b frames. 
Originally committed as revision 13639 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-03 00:43:56 +00:00
Andreas Öman
1686cce6e6 Audio channels and sample rate must be set in order to skip 
additional probing of a stream.

Originally committed as revision 13619 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-02 09:15:04 +00:00
Baptiste Coudurier
c5577c403f rename last_frame_offset to next_frame_offset, due to r13615 
Originally committed as revision 13618 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-02 04:08:30 +00:00
Michael Niedermayer
5e5c908691 redundant check-- 
Originally committed as revision 13474 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-27 21:44:42 +00:00
Michael Niedermayer
406a0fdcab Do not use the pts/dts calculation code which needs a parser, when no parser 
is available.

Originally committed as revision 13470 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-27 18:43:25 +00:00
Aurelien Jacobs
c2c3dedf6e compute the end of all chapters when end is not specified in the container 
Originally committed as revision 13363 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-24 21:44:29 +00:00
Aurelien Jacobs
ebea1d7668 cosmetics: indentation 
Originally committed as revision 13280 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-24 12:56:05 +00:00
Aurelien Jacobs
570745cc51 remove useless title check 
Originally committed as revision 13279 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-24 12:55:36 +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
b18a4ab2ae Warn user about invalid timestamps. 
Originally committed as revision 13264 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 17:52:42 +00:00
Michael Niedermayer
5c37f43a0d Make ff_new_chapter() return AVChapter instead of int so its consistant with 
av_new_program() and its simpler to set other fields in AVChapter which arent
set by ff_new_chapter().

Originally committed as revision 13262 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 13:14:11 +00:00
Michael Niedermayer
7c8202cc92 s/num_chapters/nb_chapters/ all other similar variables are called nb_*. 
Originally committed as revision 13260 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 13:07:58 +00:00
Michael Niedermayer
747fb6c60c vertical align 
Originally committed as revision 13259 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 13:04:12 +00:00
Michael Niedermayer
42720ee4d0 indent 
Originally committed as revision 13258 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 13:03:52 +00:00
Michael Niedermayer
0dac708e2d remove useless title check 
Originally committed as revision 13257 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 13:03:32 +00:00
Michael Niedermayer
6b43e2c7d3 indent 
Originally committed as revision 13256 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 13:03:04 +00:00
Michael Niedermayer
7a2a3e8e40 Add id to AVChapter, untested (where do i find matroska files with chapters?). 
Originally committed as revision 13255 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 13:02:27 +00:00
Aurelien Jacobs
842ffee386 cosmetics: indentation 
Originally committed as revision 13248 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 11:46:05 +00:00
Aurelien Jacobs
1ba056b689 allows adding chapters with NULL title 
Originally committed as revision 13247 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 11:45:30 +00:00
Anton Khirnov
79d7836a5e add support for chapters definition in lavf 
patch by Anton Khirnov  wyskas _at_ gmail _dot_ com

Originally committed as revision 13240 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-22 22:00:21 +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 Biurrun
ccd425e799 Remove unnecessary parentheses from return calls. 
Originally committed as revision 13069 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-06 09:16:36 +00:00
Michael Niedermayer
ceedda75ea minor memleak 
Originally committed as revision 12945 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-24 23:09:28 +00:00
Diego Biurrun
d965c3e7bc Print duration with higher precision. 
patch from Hervé Flores, herve.flores free fr

Originally committed as revision 12847 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-16 06:46:54 +00:00
Michael Niedermayer
4b3cca3630 Do not detect a format if another has the same score. 
Originally committed as revision 12837 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-15 13:50:02 +00:00
Reimar Döffinger
ee794d1e49 Do not call update_initial_durations if pkt->duration is 0. 
Fixes and assertion crash when playing amv files, e.g.
http://samples.mplayerhq.hu/amv/Shakira - Hips Don't Lie.amv

Originally committed as revision 12797 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-13 08:55:02 +00:00
Diego Biurrun
d952638699 typo: occured --> occurred 
Originally committed as revision 12549 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-22 01:06:57 +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
Ramiro Polla
ab8ab30c3d Introduce max_picture_buffer variable in AVFormatContext, 
set by rtbufsize option.

Originally committed as revision 12383 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-08 21:59:11 +00:00
Baptiste Coudurier
4c7981ba7c do not reset duration_error for all streams, only reset current stream, fix wrong_fps.gxf 
Originally committed as revision 12353 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-06 17:44:42 +00:00
Michael Niedermayer
ac6f133027 Set indexmem to a saner default. 
Originally committed as revision 12190 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-24 16:28:35 +00:00
Michael Niedermayer
635fbcb17f revert 12156 
Log:
Make timestamp interpolation work with mpeg2 field pictures.
Cleaner/simpler solutions are welcome.
----
A IMHO cleaner solution has been implemented.

Originally committed as revision 12162 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-20 20:24:38 +00:00
Michael Niedermayer
91acf9a8bc Get rid of a fake timestamp discontinuity at the begin of V.VOB. 
This solution is not really correct but it is quite simple. Correct would
be to do a second pass over the packets after all the headers have been
collected.

Originally committed as revision 12157 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-20 03:40:07 +00:00
Michael Niedermayer
ff2635b273 Make timestamp interpolation work with mpeg2 field pictures. 
Cleaner/simpler solutions are welcome.

Originally committed as revision 12156 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-20 03:20:06 +00:00
Michael Niedermayer
83a9db42a3 Fix timestamps and durations if the first packets have no durations nor timestamps, 
and the information needed to guess the duration only becomes known at a later packet.

Originally committed as revision 11963 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-15 20:32:32 +00:00
Michael Niedermayer
dc29622385 Remove incorrect casts that should have never been there. 
Originally committed as revision 11824 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-02 22:55:58 +00:00
Evgeniy Stepanov
f8d7c9d373 Add support for Matroska attachments. 
patch by eugeni _dot_ stepanov _at_ gmail.com and myself

Originally committed as revision 11635 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-27 15:43:17 +00:00
Aurelien Jacobs
7f938dd32b ensure av_rescale_q() can be calculated (won't divide by zero) 
Originally committed as revision 11592 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-21 23:43:25 +00:00
Diego Biurrun
a85736f21d misc spelling/grammar fixes 
Originally committed as revision 11542 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-16 22:14:26 +00:00
Paul Kelly
3dea63bd7e user specifyable maximum amount of memory to use for the index. 
patch by Paul Kelly  paul stjohnspoint co uk
with some changes by me

Originally committed as revision 11521 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-13 13:33:37 +00:00
Michael Niedermayer
5cc9253f35 indent 
Originally committed as revision 11348 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-29 16:34:51 +00:00
Michael Niedermayer
7ef55085f0 Try to fix url_split() so that the ?foobar part is in the path and only the path. 
Originally committed as revision 11347 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-29 16:13:03 +00:00
Michael Niedermayer
945208caea Fix detected fps for old divx/xvid. 
Originally committed as revision 11323 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-27 00:16:48 +00:00
Reimar Döffinger
88b0072390 100l, av_read_packet must check for read_packet error, in case of 
error pkt->stream_index could be invalid and must not be used.
Fixes a crash with http://www.cs.berkeley.edu/~dmolnar/2-snippet3.wav

Originally committed as revision 11307 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-23 13:16:55 +00:00
Aurelien Jacobs
fd2982a0a0 remove double check of pb->read_seek 
Originally committed as revision 11278 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-20 00:25:18 +00:00
Aurelien Jacobs
ceeacce68b use proper url_is_streamed() API 
instead of messing with ByteIOContext internal is_streamed field

Originally committed as revision 11276 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-19 23:26:18 +00:00
Michael Niedermayer
502bdf6893 Merge recently added and still unused play and pause functions. 
Originally committed as revision 11273 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-19 20:57:13 +00:00