virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
54,916 Commits 37 Branches 400 Tags 460 MiB
a553cb4683
Commit Graph

13105 Commits

Author SHA1 Message Date
Michael Niedermayer
8a8d9a7385 mpegts: use ffio_ensure_seekback() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-04 19:13:39 +02:00
Michael Niedermayer
186ec17843 avformat/aviobuf: Add ffio_ensure_seekback() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-04 19:13:38 +02:00
Michael Niedermayer
2ca48e4666 avformat: Append data in fill_buffer() when possible 
Data is appended in fill_buffer() when there is sufficient space left
and the data pointer only reset when needed.
Previously the data pointer was more often reset, loosing more seekback
space than otherwise needed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-04 19:13:38 +02:00
Zhang Rui
4a4c93cb3f avformat/http: support relative url redirection 
see also http://tools.ietf.org/html/draft-ietf-httpbis-p2-semantics-17#section-9.5

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-04 16:16:03 +02:00
Michael Niedermayer
b237e6282e avformat/h261dec: use init_get_bits8() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-04 13:40:08 +02:00
Paul B Mahol
d2ce3b3857 riff: remove invalid fourcc 'exr ' 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-04 11:39:58 +00:00
Matthieu Bouron
4943eff2cd lavf/movenc: fix writing of some iTunes metadata tag 
Fix metadata display under iTunes for files using pgap, hdvd, stick,
tvsn and tves tags.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-03 17:18:49 +02:00
Tudor Suciu
820ffaed0f avformat/matroskaenc: Allow VP9 and Opus in webm 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-03 00:10:50 +02:00
wm4
c3316ddb83 lavf: add support for libgme 
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-02 18:52:45 +02:00
Michael Niedermayer
d59ec0adbb avformat_find_stream_info: move ret init down from flush codecs. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-02 15:07:51 +02:00
Michael Niedermayer
c5ddd75354 avformat_find_stream_info: Do not consider no streams an error in flush codecs 
This should have no functional effect, but allows a cleaner diff when moving it
down

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-02 15:07:51 +02:00
Michael Niedermayer
c826c5698b avformat_find_stream_info: try to preserve the error code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-02 15:07:51 +02:00
Michael Niedermayer
ccba9535dc av_find_stream_info: initialize ret 
This should fix hypothetical corner cases where it might have never been initialized before use

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-02 15:07:44 +02:00
Carl Eugen Hoyos
2492f7774f avformat: Print "Consider increasing the value for analzeduration and probesize" even more often 
The sample from ticket #2691 currently does not trigger "Consider increasing
the value for analzeduration and probesize" because the audio streams are
only added after calling estimate_timings(). Attached patch moves the message
below this function call.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-02 14:08:36 +02:00
Michael Niedermayer
951a365504 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  oggdec: do not fall back on binary search in the generic code.

Conflicts:
	libavformat/oggdec.c
	tests/ref/seek/lavf-ogg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-02 11:50:30 +02:00
Anton Khirnov
8ad3267ce3 oggdec: do not fall back on binary search in the generic code. 
Binary search is already attempted in the format-specific seek function,
so the fallback is only reached if binary search failed already.
 2013-07-02 10:37:22 +02:00
wm4
a92fbe16f2 lavf/http: add support for reading streamcast metadata 
Allow applications to request reading streamcast metadata. This uses
AVOptions as API, and requires the application to explicitly request
and read metadata. Metadata can be updated mid-stream; if an
application is interested in that, it has to poll for the data by
reading the "icy_metadata_packet" option in regular intervals.

There doesn't seem to be a nice way to transfer the metadata in a nicer
way. Converting the metadata to ID3v2 tags might be a nice idea, but
the libavformat mp3 demuxer doesn't seem to read these tags mid-stream,
and even then we couldn't guarantee that tags are not inserted in the
middle of mp3 packet data.

This commit provides the minimum to enable applications to retrieve
this information at all.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-07-02 02:00:56 +02:00
Michael Niedermayer
bf87908cd8 rmdec: Pass AVIOContext to rm_read_metadata() 
Fix null pointer dereference
Fixes Ticket2588

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-02 00:45:15 +02:00
Paul B Mahol
e1b0d3a389 westwood_vqa: check return value of av_malloc() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-01 22:15:25 +00:00
Paul B Mahol
16e0416fa4 idcin: check return value of av_malloc() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-01 22:04:48 +00:00
Paul B Mahol
51f1bf3309 bfi: check return value of av_malloc() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-01 21:37:16 +00:00
Michael Niedermayer
b00e56bec5 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Support compilation on aix with gcc.
  Rename "AVClass class" as "AVClass component_class".
  Rename constant FRAMESIZE in ra144 codec as FRAME_SIZE.
  Rename thread_init() in libavcodec and libavfilter as library_thread_init().
  Rename constant HZ in af_biquads.c as HERTZ.
  Drop local lable from ppc asm timer.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-30 21:18:17 +02:00
Matthieu Bouron
9e6d063dbc lavf/movenc: use ffio_fill() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-30 16:28:51 +02:00
Michael Niedermayer
4e99660493 mpegts: use seek_back() for all seek backs 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-30 16:23:50 +02:00
Michael Niedermayer
a5f23d8da0 mpegts: factor seek_back() out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-30 16:23:46 +02:00
Michael Niedermayer
b7c6685268 mpegts_read_header: goto fail instead of return directly 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-30 16:23:42 +02:00
Carl Eugen Hoyos
0915b531bc Rename "AVClass class" as "AVClass component_class". 
The aix header math.h defines "extern int class()" for C.
 2013-06-30 13:47:45 +02:00
Reuben Martin
2fa89b2736 Added codec ID to playback DNxHD 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-29 18:02:37 +02:00
Michael Niedermayer
53fd1ab26b avformat: make av_register_*put_format() thread safe 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-29 03:46:10 +02:00
Timothy Gu
a9bbf59be7 cosmetics: Fix "dont" "wont" "doesnt" typos 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-29 02:31:16 +02:00
Michael Niedermayer
804c7b2c62 udp: Fix receiving large udp packets 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-29 00:10:15 +02:00
Carl Eugen Hoyos
f91833210e Set block_align when reading QDM2 in mov. 
Fixes ticket #2718.
 2013-06-28 09:04:16 +02:00
Carl Eugen Hoyos
7f1b3c2ca6 Fix muxing QDM2 mono into caf. 2013-06-28 09:04:16 +02:00
Reuben Martin
86190afbda gxf: Added codec ID to playback AVCHD 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-27 18:13:45 +02:00
Reuben Martin
c4db4b1756 Added GXF format code to identify AVC Intra video streams. This was an extension to the origional GXF spec implemented by Grass Valley. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-27 17:40:01 +02:00
Reuben Martin
7ebf3ab959 gxf: Factorize code in get_sindex() 
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-27 17:18:59 +02:00
Reuben Martin
0de9d3dd1c gxf: Added GXF format code 25 which is used for DV codec in HD resolutions 
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-27 17:18:41 +02:00
Nigel Touati-Evans
42bd0cd21a Fix copying extradata to codec in mxfdec.c 
The code that copies any extradata from the MXFDescriptor to the codec does
not set the size, which it should otherwise the copied data is useless.
Attached it a patch to correct this.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-27 13:32:48 +02:00
Stefano Sabatini
418b9454ff lavf/movenc: improve error feedback in case malformed AAC bitstream is detected 
Consistent with the FLV muxer.
 2013-06-26 23:22:31 +02:00
Stefano Sabatini
08b99be7c4 lavf/mux: rename variable cortag -> tagbuf2 in init_muxer() 
Possibly enhance readibility.
 2013-06-26 23:22:22 +02:00
Carl Eugen Hoyos
35aed74fdc Use AV_RN32 for an unaligned read in the mxg demuxer. 
Fixes ticket #2707.
 2013-06-26 09:33:44 +02:00
wm4
e59fb3f8b1 lavf: silence max_analyze_duration warning 
This is part of normal operation with some formats. A warning should
indicate that something is wrong, and the documentation for AV_LOG_WARNING
says: "Something somehow does not look correct."

Since this message is most likely useful for debugging only, raise the
log level accordingly.

Plus-one-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-26 01:36:27 +02:00
Paul B Mahol
ad194b0487 xa: abort if number of channels or sample rate is 0 
Fixes #2711.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-25 22:24:55 +00:00
Luca Barbato
da8c9b324c lxfdec: remove wrong and unneeded check 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-25 19:38:00 +00:00
Ronald S. Bultje
cea8a0077f yuv4mpeg: correctly handle chroma for odd luma sizes. 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-06-24 19:13:58 -04:00
Matthew Heaney
1029822a91 lavf/webvttdec: use private option to specify WebVTT kind 
WebVTT subtitle tracks have four kinds. Certain downstream muxers
(such as for WebM) need to know which WebVTT kind this is, in order to
specify the codec id of the output track.

A new private input option, "-kind", has been added to the WebVTT
demuxer.  It accepts as a value any of "subtitles" (the default),
"captions", "descriptions", and "metadata".  The kind option value is
used to assign a value to the stream disposition flag, to which four
new values have been added, corresponding the four WebVTT kinds.

Signed-off-by: Matthew Heaney <matthewjheaney@google.com>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
 2013-06-25 00:13:47 +02:00
Matthew Heaney
bc35df29c1 lavf: add AV_DISPOSITION flags for WebVTT text track kinds 
There are 4 separate WebVTT text track kinds: subtitles (the default
if not otherwise specified), captions, descriptions, and metadata.
The WebM muxer needs to know which WebVTT text track kind this is, in
order to synthesize the correct track type and codec id.

To allow a demuxer to indicate the text track kind of the input, a new
set of AV_DISPOSITION flag values has been added, corresponding to
each of the non-default text track kind values.
 2013-06-25 00:13:47 +02:00
Michael Niedermayer
a46e578dda avformat/avio: Fix EOF handiling of ffurl_read_complete() 
Fixes Ticket2537

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-24 14:23:44 +02:00
Michael Niedermayer
f48366c704 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavf: don't abort if both encoder and muxer aspect ratios are not set

Conflicts:
	libavformat/mux.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-24 11:42:42 +02:00
Michael Niedermayer
a620c8321e Merge commit 'c3e58f8fb75d8467161a65b85eb88281547ebab1' 
* commit 'c3e58f8fb75d8467161a65b85eb88281547ebab1':
  matroskaenc: restore compatibility with non referenced AVPacket

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-24 11:11:31 +02:00
Rafaël Carré
e21307a2b0 lavf: don't abort if both encoder and muxer aspect ratios are not set 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-06-24 08:03:26 +02:00
Rafaël Carré
c3e58f8fb7 matroskaenc: restore compatibility with non referenced AVPacket 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-06-24 08:03:26 +02:00
Michael Niedermayer
780b1aa1ef Merge commit 'f963f701d90bd7bb03e39aab4e59bd137084e082' 
* commit 'f963f701d90bd7bb03e39aab4e59bd137084e082':
  ogg: relax demuxer conformance checks

Conflicts:
	libavformat/oggdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-23 13:21:21 +02:00
Oka Motofumi
81c5ceeda2 avisynth: Make sure the filename passed to Avisynth is in the right code page 
Avisynth is a non-unicode application and cannot accept UTF-8
characters. Therefore, the input filename should be converted to
the code page that it expects.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-06-22 16:41:43 -04:00
Luca Barbato
f963f701d9 ogg: relax demuxer conformance checks 
Some samples in the wild are missing headers that are expected by the
specification but in practice do not affect decoding.
 2013-06-22 20:54:59 +02:00
Michael Niedermayer
03cd3bec6e avformat/iff: Byte seek is unsupported 
Fixes Ticket2194

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-20 21:49:02 +02:00
Michael Niedermayer
c605adbf56 avformat/libmodplug: Reduce the probe score for small input 
This ensures that theres enough data for mpeg_probe() to recognize mpeg-ps
Fixes Ticket2583

Based on code by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-20 14:58:50 +02:00
Carl Eugen Hoyos
06bede95fc Autodetect idcin only if audio properties allow decoding. 
Fixes ticket #2688.
 2013-06-19 17:07:44 +02:00
Compn
4110828e15 isom: add xd51 hdcam , someone needs to binary search FCP for new isom... 2013-06-19 10:43:48 -04:00
Michael Niedermayer
f8ca8138f0 ff_gen_search: fix infinite loop 
Fixes Ticket2639

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-18 22:53:00 +02:00
Michael Niedermayer
b3dd50cd0d ff_gen_search: fix limit 
The limit value could become slightly wrong in the last iteration

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-18 20:49:37 +02:00
Michael Niedermayer
9d73e30253 ff_gen_search: make step 64it to prevent hypothetical integer overflow 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-18 20:47:07 +02:00
Matthew Heaney
b24f15c45e lavf: add WebVTT muxer. 
This revision creates a WebVTT muxer, that outputs files having the
format described in the following specification:

http://dev.w3.org/html5/webvtt/
 2013-06-17 22:28:19 +02:00
Michael Niedermayer
b4579a29c7 mmsh: dont close context on seeking failure 
Fixes Ticket2581

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-17 22:03:36 +02:00
Michael Niedermayer
c7755c348b mmsh/mmsh_close: use ffurl_closep() 
avoid using freed pointers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-17 21:34:52 +02:00
Michael Niedermayer
0329345da2 mmsh/mmsh_close: use av_freep() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-17 21:33:12 +02:00
Clément Bœsch
de12b454f2 lavf/http: remove Mozilla/5.0 from user agent. 
It is notably known to break playback on http streaming servers who use
the user agent to guess if it's a browser (to display a summary) or a
player (to stream the audio data).

This reverts 1fabd95.

Fixes Ticket #2663.
 2013-06-17 17:06:11 +02:00
Michael Niedermayer
95275551ef Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  smacker: check frame size validity

Conflicts:
	libavformat/smacker.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-17 01:04:33 +02:00
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
Martin Storsjö
2681924b0f libavformat: Fix standalone compilation of the webm muxer 
The missing object file was added to the matroska muxer already, but
not to the webm muxer.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-06-06 19:55:53 +03:00
Carl Eugen Hoyos
75b9fb27f5 lavf/hlsenc: fix bogus hls segment index rewrapping logic 
The counter should not be reset since it detects the
hls segment increasing timeframe.

Fixes ticket #2643.

Reviewed-by: Stefano Sabatini
 2013-06-06 12:09:38 +02:00
Paul B Mahol
d5f7f1fef1 audio frame multi-threaded decoding 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-05 22:35:31 +00:00
Michael Niedermayer
16f3102f41 avformat/img2dec: timestamps are 64bit 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 14:41:16 +02:00
Michael Niedermayer
21bf0d6f80 avformat/network: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 14:29:04 +02:00
Michael Niedermayer
856e7dbb72 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  apetag: use int64_t for filesize

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 12:25:16 +02:00
Michael Niedermayer
82070b01b8 Merge commit '9835abb6d63fb07613994ae90e72fef758149408' 
* commit '9835abb6d63fb07613994ae90e72fef758149408':
  network: uniform ff_listen_bind and ff_listen_connect

Conflicts:
	libavformat/network.c
	libavformat/tcp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 11:56:56 +02:00
Michael Niedermayer
606e8baf0f Merge commit '7c020e1ad37d27c9d5db4d714401f09c80e3cc44' 
* commit '7c020e1ad37d27c9d5db4d714401f09c80e3cc44':
  movenc: Grow the frag_info array in chunks

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 11:33:25 +02:00
Michael Niedermayer
28ce9c0b73 Merge commit 'ab1189766a82a95f108005463cde75f73fcc0ae5' 
* commit 'ab1189766a82a95f108005463cde75f73fcc0ae5':
  movenc: Increase the cluster array allocation by doubling

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 11:26:32 +02:00
Michael Niedermayer
30b491f1c9 Merge commit '3b4feac1ec14f861bdd7f494f288f4d8dd7f449e' 
* commit '3b4feac1ec14f861bdd7f494f288f4d8dd7f449e':
  movenc: Keep track of the allocated size for the cluster array
  mem: Add av_realloc_array and av_reallocp_array

Conflicts:
	doc/APIchanges
	libavformat/movenc.c
	libavutil/mem.c
	libavutil/mem.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 11:19:16 +02:00
Anton Khirnov
e816aaacd6 apetag: use int64_t for filesize 
CC: libav-stable@libav.org
 2013-06-04 17:20:19 +02:00
Luca Barbato
9835abb6d6 network: uniform ff_listen_bind and ff_listen_connect 
Document the functions and have both use a millisecond timeout and
check for interrupt.
 2013-06-04 14:56:52 +02:00
Andrey Semashev
7c020e1ad3 movenc: Grow the frag_info array in chunks 
Previously it was grown one element at a time, which leads to
excessive reallocations.

Bug-Id: 525
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-06-04 15:05:42 +03:00
Andrey Semashev
ab1189766a movenc: Increase the cluster array allocation by doubling 
The previous allocation increment of 16384 meant that the cluster
array was allocated for 0.6 MB initially, which is a bit excessive
for cases with fragmentation where only a fraction of that ever
actually is used.

Therefore, start off at a much smaller value, and increase by
doubling (to avoid reallocating too often when writing long
non-fragmented mp4 files).

Bug-Id: 525
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-06-04 15:05:31 +03:00
Andrey Semashev
3b4feac1ec movenc: Keep track of the allocated size for the cluster array 
When writing fragmented mp4, the cluster array is reset when a
fragment is written. Instead of starting off reallocating the
array only based on the number of current elements in it, keep
track of how many elements there were allocated earlier.

This avoids reallocating this array needlessly when writing
fragmented mp4 files.

Bug-Id: 525
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-06-04 15:05:12 +03:00
Lukasz Marek
7faafe606f ftp: fix using uninitialized value 
Fix coverity issue CID 1026777

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2013-06-04 13:08:23 +02:00
Paul B Mahol
d19d679e4b lavf/aacdec: add support for reading ape tags 
Closes #2634.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-03 23:10:57 +00:00
Paul B Mahol
55121f3fa9 tta: add support for reading ape tags 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-03 23:04:43 +00:00
Paul B Mahol
0e84ba747e tta: return meaningful error codrs 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-03 22:26:16 +00:00
Michael Niedermayer
c8faa47484 avformat/network: check the return value from setsockopt() 
Fixes: CID1026742
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 16:12:00 +02:00
Michael Niedermayer
2fe4b6210c matroskadec: fix memleak of pkt_data 
Fixes: CID1026767
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 16:08:38 +02:00
Michael Niedermayer
0722b4d08c matroskadec: favor av_freep() 
av_freep() is safer as it zeros the pointer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 16:05:09 +02:00
Michael Niedermayer
3da7111193 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  movenc: Change the track struct name to match the typedef

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 12:54:43 +02:00
Michael Niedermayer
e5cdf9c03b Merge commit '2d66a58ccde05e764594bd7e5f0f9244634d0b2c' 
* commit '2d66a58ccde05e764594bd7e5f0f9244634d0b2c':
  Go2Webinar decoder

Conflicts:
	Changelog
	configure
	libavcodec/avcodec.h
	libavcodec/codec_desc.c
	libavcodec/version.h
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 12:47:26 +02:00
Michael Niedermayer
45a73d2b47 Merge commit 'c011ceef78eae66039efc66d9551a7146e08838a' 
* commit 'c011ceef78eae66039efc66d9551a7146e08838a':
  swscale: ppc: Remove commented-out define cruft
  nsvdec: Remove commented-out debug cruft
  cpu: Restructure code to avoid pointless ret variable indirection

Conflicts:
	libavutil/cpu.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 11:53:05 +02:00
Martin Storsjö
9683e37cd5 movenc: Change the track struct name to match the typedef 
This makes the struct name (which isn't used anywhere) match the
name of the typedef, as for all the other structs declared in this
header.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-06-03 11:08:18 +03:00
Kostya Shishkov
2d66a58ccd Go2Webinar decoder 2013-06-03 09:24:55 +02:00
Diego Biurrun
9f84ed8cc3 nsvdec: Remove commented-out debug cruft 2013-06-02 18:11:58 +02:00
Michael Niedermayer
a40370661d use Kostyas full name in copyrights 
This fixes 2 files that where not part of the original change
See: de421b2085

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-02 11:25:56 +02:00
Michael Niedermayer
54ddbb477b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  network: factor out connect-listening code

Conflicts:
	libavformat/network.h
	libavformat/tcp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-02 11:02:02 +02:00
Michael Niedermayer
4d4f5911d3 Merge commit '28306e6d620c109ddd672f7243adfbc2bbb3b18f' 
* commit '28306e6d620c109ddd672f7243adfbc2bbb3b18f':
  network: factor out bind-listening code
  use my full first name instead of short one in copyrights

Conflicts:
	libavformat/tcp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-02 10:30:35 +02:00
Luca Barbato
f849a77e67 network: factor out connect-listening code 
Introduce ff_listen_connect, to be shared with the other
non-tcp network protocols.
 2013-06-01 15:29:53 +02:00