generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
58,336 Commits 24 Branches 241 Tags
Commit Graph

14037 Commits

Author SHA1 Message Date
Michael Niedermayer
e99f324c14 Merge commit '58c95448e42d34910b939363949ba1a92c06b0b0' 
* commit '58c95448e42d34910b939363949ba1a92c06b0b0':
  smacker: pad the extradata allocation

Conflicts:
	libavformat/smacker.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-17 00:44:32 +02:00
Michael Niedermayer
1f87cbe834 Merge commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef' 
* commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef':
  avf: move url utility functions in a separate file

Conflicts:
	libavformat/internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-17 00:09:31 +02:00
Michael Niedermayer
8097307bfb Merge commit '12db891dcd57b305d6e3c1e22ea8204dc26edda1' 
* commit '12db891dcd57b305d6e3c1e22ea8204dc26edda1':
  avf: move ff_write_chained to mux.c

Conflicts:
	libavformat/mux.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-16 23:58:59 +02:00
Michael Niedermayer
bbdef61850 Merge commit '508998f7d5cc61c7ac7b049813b47adc24c6e282' 
* commit '508998f7d5cc61c7ac7b049813b47adc24c6e282':
  avf: move riff tags accessors where they belong

Conflicts:
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-16 23:52:08 +02:00
Michael Niedermayer
84f77f8423 Merge commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c' 
* commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c':
  avf: move ff_http_match_no_proxy to network

Conflicts:
	libavformat/internal.h
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-16 23:45:42 +02:00
Michael Niedermayer
4a522eff00 Merge commit 'afc8685395e775fe0f2a1698b683aea4afd124af' 
* commit 'afc8685395e775fe0f2a1698b683aea4afd124af':
  avf: split off format register and lookup function

Conflicts:
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-16 23:38:27 +02:00
Paul B Mahol
e997afdfc6 lavf: show APIC for tta files too 
Fixes #2676.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-16 18:56:56 +00:00
Paul B Mahol
9ea7ff7955 tta: read ape tags last 
Otherwise, cover art will create video stream with index 0.
Fixes #2677.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-16 18:56:56 +00:00
Kostya Shishkov
ee16a0ced0 smacker: check frame size validity 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-06-16 15:57:31 +02:00
Kostya Shishkov
58c95448e4 smacker: pad the extradata allocation 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-06-16 15:57:31 +02:00
Luca Barbato
df9f22d42b avf: move url utility functions in a separate file 2013-06-16 15:01:39 +02:00
Luca Barbato
12db891dcd avf: move ff_write_chained to mux.c 2013-06-16 14:41:07 +02:00
Luca Barbato
508998f7d5 avf: move riff tags accessors where they belong 2013-06-16 14:41:07 +02:00
Luca Barbato
ec7c51c786 avf: move ff_http_match_no_proxy to network 
It is only used by network protocols.
 2013-06-16 14:41:00 +02:00
Luca Barbato
afc8685395 avf: split off format register and lookup function 2013-06-16 14:00:40 +02:00
James Almer
1bb005ce54 lavf/md5enc: Use AV_HASH_MAX_SIZE 
Also increase the buffer size in write_trailer(), since 128
is not enough anymore

Signed-off-by: James Almer <jamrial@gmail.com>
 2013-06-15 18:50:11 -03:00
Paul B Mahol
a75d2a6505 apetag: do not require seekable output 
Also don't write empty tags.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-14 17:07:36 +00:00
Peter Ross
d891d354c5 mpegts: Enable muxing of SMPTE KLV metadata 
Muxer code rebased/split out by: Jeff Blackburne <jblackburne@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-14 13:41:40 +02:00
Michael Niedermayer
4027e13663 Merge commit '42d73f7f6bea0ee0f64a3ad4882860ce5b923a11' 
* commit '42d73f7f6bea0ee0f64a3ad4882860ce5b923a11':
  4xm: do not overread while parsing header

Conflicts:
	libavformat/4xm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-13 11:56:31 +02:00
Michael Niedermayer
60657ee37a Merge commit 'e7a44f87d07655ec0cd31c315936931674434340' 
* commit 'e7a44f87d07655ec0cd31c315936931674434340':
  4xm: refactor fourxm_read_header

Conflicts:
	libavformat/4xm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-13 10:08:50 +02:00
Michael Niedermayer
90c8863a74 Merge commit 'e6496ea7e7ea7355167a1ccbe67a7199d446a654' 
* commit 'e6496ea7e7ea7355167a1ccbe67a7199d446a654':
  4xm: K&R formatting cosmetics

Conflicts:
	libavformat/4xm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-13 09:50:42 +02:00
Luca Barbato
42d73f7f6b 4xm: do not overread while parsing header 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-06-12 14:45:46 +02:00
Luca Barbato
e7a44f87d0 4xm: refactor fourxm_read_header 
Split sound and video tag parsing in separate functions.
 2013-06-12 14:45:46 +02:00
Luca Barbato
e6496ea7e7 4xm: K&R formatting cosmetics 2013-06-12 14:45:46 +02:00
Alexandre Sicard
b1d61eb7aa avformat/mov: ignore samples overflowing next_root_atom 
This fixes #2657.
ISML movies produced by Microsoft Expression Encoder 4 seem to have invalid
sample entries in their trun/tfhd for data tracks. As a result, too much bytes
are read for these tracks to the point that next_root_atom can go out of
buffer, which makes the encoding fail if the input is not seekable.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-12 00:51:38 +02:00
Michael Niedermayer
045e371cf1 Merge commit '8835c554ff506992c47f6e347c74216ae073f0fa' 
* commit '8835c554ff506992c47f6e347c74216ae073f0fa':
  matroskadec: introduce resync function.

Conflicts:
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-11 09:16:13 +02:00
Sean McGovern
8835c554ff matroskadec: introduce resync function. 
This allows handling matroska files with errors.
Fixes test4.mkv and test7.mkv from the official Matroska test suite,
and by extension Bugzilla #62.

Based on a patch by Reimar Doffinger <Reimar.Doeffinger@gmx.de>

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-06-10 20:51:35 +02:00
Carl Eugen Hoyos
e9df8f7725 Accept incomplete http cookies without domain. 
Works around a bug in some servers that apparently send incomplete cookies.
Fixes a part of ticket #2619.

Reviewed-by: Micah Galizia
 2013-06-10 10:52:40 +02:00
Stephen Hutchinson
8ed6c13fe3 libutvideo: Add ULH0 and ULH2 decoding when using version 13.0.1 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-10 10:12:15 +02:00
Yusuke Nakamura
2578f1efd6 riff: Support ULH0 and ULH2 fourccs. 
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
 2013-06-10 09:37:53 +02:00
Michael Niedermayer
6241e8a382 id2v2: check the return value of decode_str() 
Fixes CID1030348
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-09 17:25:39 +02:00
Carl Eugen Hoyos
c153ea4756 Support decoding G.722 in aiff. 2013-06-09 01:10:36 +02:00
Michael Niedermayer
2a91038e13 avformat/wavdec: Dont rescale timestamps but use exact comparission 
Fixes integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-08 20:02:22 +02:00
Paul B Mahol
9644fc95be matroskadec: move ALAC extradata creation bellow AAC one 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-08 17:39:51 +00:00
Lukasz Marek
ff35c7cdfa ftp: add invalid code for RETR operation 
554 is possible invalid code:
- Restart not valid
- Command terminated due to server shutdown in progress
- etc...

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2013-06-08 04:17:34 +02:00
Lukasz Marek
89b4800eef ftp: probe seek capability 
Make FTP streamed when server doesn't accept REST command

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2013-06-08 04:17:34 +02:00
Lukasz Marek
eeedca4b7f ftp: fix seeking beyond file size 
adjust to ff* tools seek nature

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2013-06-08 04:17:33 +02:00
Lukasz Marek
4d617715c9 ftp: abort function optimalization 
It seems some ftp servers doesn't respect ABOR command,
but closing both connection is slow.

This commit keeps control connection open when possible.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2013-06-08 04:17:26 +02:00
Lukasz Marek
bc29acdc76 ftp: explicit return code checks 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2013-06-08 03:54:55 +02:00
Lukasz Marek
43eda88200 ftp: fix flush control connection input 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2013-06-08 03:54:55 +02:00
Lukasz Marek
23a76b71de ftp: reconnect on tcp read error 
This commit reconnect both connections and retries before ftp_read returns an error.
Practical use case: resume after lock screen on iOS devices.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2013-06-08 03:54:55 +02:00
Alexandre Sicard
8912029031 avformat/mov: compute dts_shift with trun cts 
Some movies have negative composition time offsets in their trun, causing pts <
dts errors. This patch makes use of dts_shift to handle them.

Signed-off-by: Alexandre Sicard <alexandre.sicard@smartjog.com>
 2013-06-07 16:30:27 +02:00
Paul B Mahol
369684f109 tta: unbreak demuxing of files with id3 tags at start of file 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-07 10:39:21 +00:00
Paul B Mahol
5bafe0ce44 tta: replace datalen with nb_samples 
This is less confusing.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-07 09:49:04 +00:00
Paul B Mahol
379fcc4955 id3v2: read all textual chapter subframes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-07 09:28:07 +00:00
Atli Thorbjornsson
f3c51215ce flvdec: Fix mistakenly discarding metadata at dts==0 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-07 11:11:59 +02:00
Michael Niedermayer
9c9d2e9c77 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rtpdec: Fix the alphabetical ordering in registering depacketizers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-07 10:17:20 +02:00
Michael Niedermayer
a18bf95a8e Merge commit '2681924b0f3f35840dd9d9825df9f9239c448b22' 
* commit '2681924b0f3f35840dd9d9825df9f9239c448b22':
  libavformat: Fix standalone compilation of the webm muxer

Conflicts:
	libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-07 10:12:46 +02:00
Clément Bœsch
00f4998997 lavf/tee: pesudo → pseudo. 2013-06-06 20:29:38 +02:00
Martin Storsjö
aa2c918f7d rtpdec: Fix the alphabetical ordering in registering depacketizers 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-06-06 19:56:05 +03:00