virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity
53,745 Commits 37 Branches 400 Tags 467 MiB
87917a3283
Commit Graph

12851 Commits

Author SHA1 Message Date
Clément Bœsch
716dbc7e13 lavf/allformats: align nit for tee muxer. 2013-06-01 02:36:07 +02:00
James Almer
6510686c16 lavf/tta: check header and seek table checksum 
Since we don't check for seek table integrity in the decoder anymore,
check it in the demuxer instead (Only tta files are guaranteed to have
one, and it should be valid there).

Check also for header integrity, since the check done in the decoder
is ignored because matroska doesn't store the header at all.

Signed-off-by: James Almer <jamrial@gmail.com>
 2013-05-31 21:10:57 +00:00
Lukasz Marek
ddbcc48b64 ftp: enhanced error handling 
Add error codes to expected codes to make responses faster.
Success of a command is validated by comparing code to a success code.
 2013-05-31 16:54:03 +02:00
Lukasz Marek
34c423894c ftp: reconnect on seek 
ABOR command usually takes long (FTP server implementation dependent).
It also produces different response codes from different servers.

It is save for ffmpeg to reconnect both connection during seek for two reasons:
1. Alreay mentioned heavy manner of ABOR command.
2. Server may disconnected due to no transfer (seek after a long pause in ffmpeg client)
 2013-05-31 16:52:39 +02:00
Lukasz Marek
d99beeb70e ftp: move common commands code to function 
Each send command routine requires the same steps.
This commit moves repeated code into one function.
 2013-05-31 16:42:26 +02:00
Lukasz Marek
3f00521809 ftp: enhanced status code handling 
Reimplementation of ftp_status function.
New version requires explicit list of expected codes.
It flush data connection input before sending a command
and blocks until expected result appears.
 2013-05-31 16:42:25 +02:00
Lukasz Marek
1931c2d265 ftp: reconnect on read 
FTP server may disconnect after some period of time when no transfer is done.

FTP protocol should reconnect and seek to last position.
 2013-05-31 16:40:03 +02:00
Lukasz Marek
c84d6aa2f6 ftp: move create control connection to function 
Move common code that opens control connection to function.
This code can be reused when reconnecting to FTP server
after inactivity.
 2013-05-31 15:57:58 +02:00
Lukasz Marek
e46e49e31d ftp: credentials moved into FTPContext 
FTP server may disconnect client.

This commit stores credentials for future reconnect.
 2013-05-31 15:57:58 +02:00
Lukasz Marek
80cce899f6 ftp: rename function name 
ftp_send_command was used only once.

This commit makes this function specific, not generic
 2013-05-31 15:57:58 +02:00
Lukasz Marek
afa30e51d1 ftp: formatting and typos fixes 2013-05-31 15:57:57 +02:00
Matthieu Bouron
f468325d34 lavf/id3v2enc: fix cover art display on some software 
Adding an arbitrary amount of padding bytes at the end of the
ID3 metadata fixes cover art display for some software (iTunes,
Traktor, Serato, Torq).

For reference (ID3 metadata):

[ Apic frames ]                      -> cover doesn't show up
[ Apic frames, Padding ]             -> ok
[ Apic frames, ID3 frames ]          -> ok
[ ID3 frames, Apic frames ]          -> cover doesn't show up
[ ID3 frames, Apic frames, Padding ] -> ok
 2013-05-30 21:16:57 +00:00
Paul B Mahol
c4e0e31424 tta: remove pointless code 
Checking seek table crc in decoder is pointless, as seek table is not used in
decoder anyway, so also stop storing seek table into extradata.
 2013-05-30 20:17:27 +00:00
Michael Niedermayer
29e97cd6c3 avformat/mov: Try to detect and support files with invalid sample sizes 
Fixes Ticket2605

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-30 00:32:36 +02:00
Paul B Mahol
38fefbc474 wtvenc: use ffio_fill() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-29 18:14:43 +00:00
Paul B Mahol
f46732fe4d wvenc: remove flush call, not needed since 4f112a8e3 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-29 14:25:34 +00:00
Paul B Mahol
6d3b913479 remove APEv1 tag writer 
Not used anymore.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-29 14:06:26 +00:00
Paul B Mahol
be5a55535e apetag: do not create invalid APE tags 
APEv2 specifications forbids non-ascii keys.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-29 14:01:15 +00:00
Paul B Mahol
96db307b3d lavf/flacenc: use ffio_fill() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-29 10:40:13 +00:00
Michael Niedermayer
d9cde3976c Merge commit '2d2d6a4883479403798f4ed46941d5b365823570' 
* commit '2d2d6a4883479403798f4ed46941d5b365823570':
  lavf: add a raw WavPack muxer.
  apetag: add support for writing APE tags
  matroskaenc: support muxing WavPack

Conflicts:
	libavformat/Makefile
	libavformat/allformats.c
	libavformat/apetag.h
	libavformat/version.h
	libavformat/wvenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-29 10:40:42 +02:00
Michael Niedermayer
53015bb3b3 Merge commit '794ca87d2bff2513118de8b97595b3e23070e67d' 
* commit '794ca87d2bff2513118de8b97595b3e23070e67d':
  wvdec: split block header parsing into a separate file

Conflicts:
	libavformat/Makefile
	libavformat/wvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-29 10:07:30 +02:00
Michael Niedermayer
ad649e829d Merge commit '0a1a94450a28eef854162f859e79ecfb9f97915b' 
* commit '0a1a94450a28eef854162f859e79ecfb9f97915b':
  lavf: rename wv.c to wvdec.c

Conflicts:
	libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-29 09:54:13 +02:00
Anton Khirnov
2d2d6a4883 lavf: add a raw WavPack muxer. 2013-05-28 18:19:19 +02:00
Anton Khirnov
88de0c7901 apetag: add support for writing APE tags 
This will be useful in the WavPack muxer.
 2013-05-28 18:19:03 +02:00
Anton Khirnov
01656fd476 matroskaenc: support muxing WavPack 2013-05-28 18:18:57 +02:00
Anton Khirnov
794ca87d2b wvdec: split block header parsing into a separate file 
It will be reused by other muxers and demuxers.
 2013-05-28 17:47:59 +02:00
Anton Khirnov
0a1a94450a lavf: rename wv.c to wvdec.c 
wv.c will be used for shared wavpack functions.
 2013-05-28 17:47:30 +02:00
Paul B Mahol
ced0307ea9 tta: make probing more robust 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-28 11:46:10 +00:00
Dave Yeo
e615a77799 os2threads: move from lavc to compat/ 
For useage in other places besides lavc. Needed after commit
90f9a5830b

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 12:49:20 +02:00
Paul B Mahol
269fc8e049 lavf/wvenc: remove hacks since wavpack demuxer & decoder hacks have been fixed 2013-05-28 10:46:57 +00:00
Michael Niedermayer
3ed3aaab32 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  smacker: assign video frame PTS
  matroskadec: export full wavpack blocks.

Conflicts:
	libavcodec/wavpack.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 11:58:46 +02:00
Michael Niedermayer
8012f93ed8 Merge commit '5074f4545c439420daebe4c2f28ed216440b6ec7' 
* commit '5074f4545c439420daebe4c2f28ed216440b6ec7':
  wavpack demuxer: export full wavpack blocks.

Conflicts:
	libavformat/wv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 11:49:30 +02:00
Michael Niedermayer
f6beb36115 Merge commit 'c330eba84cf2370ad72423aa9e410e20afdc52e2' 
* commit 'c330eba84cf2370ad72423aa9e410e20afdc52e2':
  lavf: preserve side data when parsing packets.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 09:51:19 +02:00
Kostya Shishkov
851bc1d6be smacker: assign video frame PTS 2013-05-28 09:03:41 +02:00
Anton Khirnov
9b6f47c448 matroskadec: export full wavpack blocks. 
This allows us to get rid of demuxer-specific hacks in the decoder and
will allow streamcopy from matroska once we have a wavpack muxer.
 2013-05-28 08:14:35 +02:00
Anton Khirnov
5074f4545c wavpack demuxer: export full wavpack blocks. 
Currently the demuxer shaves the blocks and exports only the
information that is useful to the decoder.

Exporting the blocks just as they are stored is simpler to understand
and will make remuxing wavpack easier.
 2013-05-28 08:14:05 +02:00
Michael Niedermayer
91db8ff203 Merge commit '564b7e0c0095768cd20001b28154d69462be54e7' 
* commit '564b7e0c0095768cd20001b28154d69462be54e7':
  matroskadec: silently skip CodecState element.
  smacker: fix off-by-one error in palette expanding code

Conflicts:
	libavformat/smacker.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 08:04:02 +02:00
Anton Khirnov
c330eba84c lavf: preserve side data when parsing packets. 2013-05-28 08:00:07 +02:00
Anton Khirnov
564b7e0c00 matroskadec: silently skip CodecState element. 
mkvmerge apparrently uses it for mpeg1/2 video, but it contains the same
information as CodecPrivate, so it can be ignored.
 2013-05-27 21:25:53 +02:00
Kostya Shishkov
c3c08baefb smacker: fix off-by-one error in palette expanding code 2013-05-27 18:19:08 +02:00
Clément Bœsch
477f4efd0f lavf/swf: remove unused assert include. 2013-05-26 15:48:50 +02:00
Michael Niedermayer
4758e32a6c matroska_read_seek: Fix used streams for subtitle index compensation 
Might fix Ticket1907 (I have no testcase so i cant test)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 13:14:01 +02:00
Michael Niedermayer
5292dac34c avformat/mov: Rename alt_sample_size so its name matches what it is 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-25 18:47:36 +02:00
Michael Niedermayer
760a9754ca img2dec: support seeking with ts_from_file 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-25 12:06:14 +02:00
Michael Niedermayer
a753776ff5 img2dec: dont set start_time/duration to invalid values 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-25 12:05:32 +02:00
Andrey Utkin
70fbfd75c3 img2dec: Add ts_from_file option 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-25 11:42:28 +02:00
Reimar Döffinger
4059c7836a framemd5_class and md5enc_class may not be identical. 
Due the crappy issue of classes having to be unique,
we cannot even have classes with identical content,
otherwise the compiler or linker is free to merge them,
giving the same result and bugs as if we had only one class.
Besides redesigning the option code to handle this correctly
I see only the option of requiring any two classes to have
different names, but the list of requirements for
AVClasses is getting kind of unmanageable.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-05-24 16:28:25 +02:00
Thilo Borgmann
4a2c2a09a2 Fix compilation with --disable-everything --enable-muxer=vc1 
Suggested-by: Reimar
 2013-05-24 14:19:19 +00:00
Michael Niedermayer
6d02bdc338 vformat/wtvenc: fix doxygen comments 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 15:36:54 +02:00
Michael Niedermayer
68ff528969 avformat/wtvdec: fix doxygen comments 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 15:36:54 +02:00