virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
Code Issues Releases Activity
81,723 Commits 37 Branches 400 Tags
Commit Graph

19365 Commits

Author SHA1 Message Date
Michael Niedermayer
d0b21b28a3 avformat/flacdec: Fix seeking close to EOF 
Fixes Ticket5428

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-06-22 21:10:37 +02:00
Clément Bœsch
a444a50510 Merge commit '11de006babf735aafa3462d43dd2c02bb6ac6e2f' 
* commit '11de006babf735aafa3462d43dd2c02bb6ac6e2f':
  Combine deprecation guards where appropriate

Merged-by: Clément Bœsch <clement@stupeflix.com>
 2016-06-22 17:36:42 +02:00
Clément Bœsch
48ac4532d4 lavf/img2dec: add pnm pipe demuxers 2016-06-22 15:24:19 +02:00
Michael Niedermayer
99c3c3237b avformat/utils: Use internal->avctx for bitrate in estimate_timings_from_bit_rate() if needed 
The internal avctx bitrate is copied into codecpar after estimate_timings()

Fixes Ticket5646

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-06-22 14:16:58 +02:00
Michael Niedermayer
4fecb97fd3 avformat/utils: change bit_rate to 64 bit in estimate_timings_from_bit_rate() 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-06-22 14:16:58 +02:00
Clément Bœsch
5d48e4eafa Merge commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196' 
* commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196':
  tests: Move all test programs to a subdirectory

Merged-by: Clément Bœsch <clement@stupeflix.com>
 2016-06-22 13:44:34 +02:00
Michael Bradshaw
989a614b70 libavformat/matroskaenc: omit segment UID for webm 
SegmentUID is not a supported element in WebM. See:
http://www.webmproject.org/docs/container/#SegmentUID

Reviewed-by: Dave Rice <dave@dericed.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-06-22 12:12:46 +02:00
Clément Bœsch
5558ff3a9f Merge commit '257f00ec1ab06a2a161f535036c6512f3fc8e801' 
* commit '257f00ec1ab06a2a161f535036c6512f3fc8e801':
  Split global .gitignore file into per-directory files

Merged-by: Clément Bœsch <clement@stupeflix.com>
 2016-06-22 11:28:51 +02:00
Michael Niedermayer
e0faad837c avformat/flvdec: Do not check last size if it could not be read due to EOF 
Fixes part of Ticket5648
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-06-22 03:02:47 +02:00
Michael Niedermayer
3f380b9b40 avformat/flvdec: Also print sum_flv_tag_size on size mismatches 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-06-22 03:02:47 +02:00
Michael Niedermayer
e8931d79cc avformat/flvdec: Accept last size if its off by 1 
Fixes part of Ticket5648

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-06-22 03:02:47 +02:00
Clément Bœsch
00e122bc0f Merge commit 'bc2a32969eb4db17677971def5ad5b936d9d1648' 
* commit 'bc2a32969eb4db17677971def5ad5b936d9d1648':
  rtsp: Parse SSRC attributes in the SDP

Merged-by: Clément Bœsch <u@pkh.me>
 2016-06-21 22:26:44 +02:00
Clément Bœsch
4873952f88 Merge commit '9ea78fd00a49f0691c1a5134eb59d4e5bb380a2a' 
* commit '9ea78fd00a49f0691c1a5134eb59d4e5bb380a2a':
  rtpdec: Always check if we have the next packet queued

Merged-by: Clément Bœsch <u@pkh.me>
 2016-06-21 22:24:30 +02:00
Clément Bœsch
e276f21f99 Merge commit 'e9443105ea4e8bc1d826ddceeba2816488c6ce92' 
* commit 'e9443105ea4e8bc1d826ddceeba2816488c6ce92':
  avio: Remove a leftover comment

Merged-by: Clément Bœsch <u@pkh.me>
 2016-06-21 22:10:54 +02:00
Clément Bœsch
8df1dbd798 Merge commit '5afb94c817abffad030c6b94d7003dca8aace3d5' 
* commit '5afb94c817abffad030c6b94d7003dca8aace3d5':
  Mark read-only tables as static

Merged-by: Clément Bœsch <u@pkh.me>
 2016-06-21 22:09:35 +02:00
Clément Bœsch
8ef57a0d61 Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb' 
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb':
  cosmetics: Fix spelling mistakes

Merged-by: Clément Bœsch <u@pkh.me>
 2016-06-21 21:55:34 +02:00
Aman Gupta
373b82066c avformat/mpegts: include stream type for aac 
this removes the need to probe to discover aac streams
inside mpegts containers, thus speeding up initial playback.

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-06-21 21:21:30 +02:00
Clément Bœsch
9204a84998 Merge commit '5c31eaa9998b2185e0aa04d11adff128498dc14a' 
* commit '5c31eaa9998b2185e0aa04d11adff128498dc14a':
  Remove unnecessary get_bits.h #includes and add missing headers where needed.

Merged-by: Clément Bœsch <clement@stupeflix.com>
 2016-06-21 15:42:49 +02:00
Clément Bœsch
c01f1157ac Merge commit '0f40c9098498ad90dbbd2380eb4269015e84bde4' 
* commit '0f40c9098498ad90dbbd2380eb4269015e84bde4':
  Drop pointless assert.h #includes

Merged-by: Clément Bœsch <clement@stupeflix.com>
 2016-06-21 15:26:20 +02:00
Clément Bœsch
82439dec0f Merge commit '74d98d1b0e0e7af444c933ea3c472494de3ce6f2' 
* commit '74d98d1b0e0e7af444c933ea3c472494de3ce6f2':
  mpegts: Validate the SL Packet Header Configuration

See e630ca5111077fa8adc972fe8a3d7e2b3e8dc91f

Our local timestamp_len > 64 is adjusted to > 63 to match the Libav
check and the actual specifications (14496-1, 10.2.2).

There is no need to request a sample as it violates the specifications
and such a file would likely be the result of a crafted/fuzzed sample.

On the other hand, the clipping of the value is kept for extra safety.

Merged-by: Clément Bœsch <clement@stupeflix.com>
 2016-06-21 14:46:36 +02:00
James Almer
afd04058bc avformat/oggparsevorbis: free base64 encoded data immediately after decoding it 
It has no use afterwards and freeing it before calling ff_flac_parse_picture()
may help prevent OOM issues on memory constrained scenarios.

Signed-off-by: James Almer <jamrial@gmail.com>
 2016-06-20 23:04:42 -03:00
James Almer
8b5b756c4d avformat/oggparsevorbis: use the base64 decode size macro 
Allocate the memory needed for the decoded data rather than the
encoded data.

Signed-off-by: James Almer <jamrial@gmail.com>
 2016-06-20 23:04:35 -03:00
Paul B Mahol
470cd0c5fe Add TrueMotion 2.0 Real Time decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2016-06-20 15:48:12 -04:00
Paul B Mahol
d78fd2fa21 Add MagicYUV decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2016-06-20 15:45:51 -04:00
Matthieu Bouron
acfab2dce6 lavf/mov: ignore ctts entries that do not apply to a least one sample 
Fixes packet pts of samples which contain ctts entries with count <= 0.
 2016-06-20 15:43:14 +02:00
Marton Balint
e07b8d68f5 avformat/mux: do not call write_packet with a flush packet if header is not written 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-06-20 00:27:26 +02:00
Marton Balint
517fe64406 avformat/mux: do not call write_header multiple times if it fails the first time 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-06-20 00:27:26 +02:00
Michael Niedermayer
3fd0694a11 avformat/version: Change the version bumping comment 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-06-20 00:08:45 +02:00
Marton Balint
cc16229d91 avformat/udp: replace packet_gap with bitrate option 
We haven't had a stable release since the packet_gap addition, so probably it
is worth reworking the option to something that makes more sense to the end
user. Also add burst_bits option to specify maximum length of bit bursts.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-06-19 22:55:57 +02:00
Marton Balint
0a06569487 avformat/udp: do not accumulate packet_gap delay errors 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-06-19 22:54:57 +02:00
Carl Eugen Hoyos
e274113292 lavc/cafenc: Allow QDMC muxing. 2016-06-19 18:51:39 +02:00
Vittorio Giovara
846a3e78a5 mov: Support prores with multiple stsd 
This function needs to return false, or data in the additional tables
will be skipped, and the decoder will not be able to decode frames
associated with them.
 2016-06-17 11:38:33 -04:00
Vittorio Giovara
7672997004 mov: Implement support for multiple sample description tables 
Store data from each stsd in a separate extradata buffer, keep track of
the stsc index for read and seek operations, switch buffers when the
index differs. Decoder is notified with an AV_PKT_DATA_NEW_EXTRADATA
packet side data.

Since H264 supports this notification, and can be reset midstream, enable
this feature only for multiple avcC's. All other stsd types (such as
hvc1 and hev1) need decoder-side changes, so they are left disabled for
now.

This is implemented only in non-fragmented MOVs.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2016-06-17 11:38:33 -04:00
Kongqun Yang
54327c2b34 Add experimental support for vp9 in iso-bmff 
Implemented according to the draft specification
"VP Codec ISO Media File Format Binding":
http://www.webmproject.org/vp9/#draft-vp-codec-iso-media-file-format-binding

'-strict -2' is required to use this feature.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2016-06-17 10:36:09 -04:00
Yuri Zats
ebda8216dc avformat/http: change seek_ret to int64 
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-06-16 23:55:21 +02:00
Hendrik Leppkes
cb46b78b2e os_support: use the appropriate stat functions matching the stat type 
The stat struct is defined to stati64, which requires using the appropriate wstati/stati functions as well.
Fixes a whole bunch of compiler warnings as well as build breakage with the decklink avdevice.

Fixes trac #5640
 2016-06-14 23:49:42 +02:00
Aman Gupta
ddffafc0b0 avformat/utils: in debug mode, print number of streams found before avformat_find_stream_info() 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-06-14 21:37:21 +02:00
Aman Gupta
e9391ab121 avformat/mpegts: enhance logging in trace mode 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-06-14 21:34:23 +02:00
Stefano Sabatini
4b5620446a lavf/utils: fix timestamp trace log in estimate_timings() function 
Use the correct timebase, also replace "stream" with "format" in the
context of the format.
 2016-06-14 12:11:04 +02:00
Martin Storsjö
cab237953e rtpdec_vp9: Support parsing the scalability structure 
We still only support one single layer though, but this allows
receiving streams that have this structure present even for
single layer streams.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2016-06-14 08:00:17 +02:00
Martin Storsjö
d50b3fe463 rtpdec_h264: Use avpriv_report_missing_feature instead of a manual av_log 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2016-06-14 08:00:17 +02:00
Martin Storsjö
94dee9067a rtpdec: Use AVERROR_PATCHWELCOME instead of AVERROR(ENOSYS) for 
unimplemented features

Signed-off-by: Martin Storsjö <martin@martin.st>
 2016-06-14 08:00:17 +02:00
Martin Storsjö
43880f9716 rtpdec_vp9: Update header parsing to spec draft 02 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2016-06-14 08:00:17 +02:00
Martin Storsjö
03aa4cd22b rtpdec_vp9: Make sure to free the temp buffer on close 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2016-06-14 08:00:17 +02:00
Michael Niedermayer
00c4861f13 avformat/mpegts: adjust probe score for low check_count 
Fixes mis-detection of tiff as mpegts
Fixes Ticket5565

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-06-14 02:20:10 +02:00
Marton Balint
9da27fb579 avformat/mux: factorize header writing code 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-06-13 22:43:22 +02:00
Marton Balint
301ead1313 avformat/mux: call deinit if write_header fails 
Docs clearly states that av_write_trailer should only be called if
avformat_write_header was successful, therefore we have to deinit if we return
failure.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-06-13 22:43:22 +02:00
Marton Balint
4bee44007a avformat/mxfdec: check if source_package is NULL 
Fixes ticket #5554.

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-06-13 22:43:22 +02:00
Thomas Bernard
836f3555a8 avformat/au: Read MetaData from AU Sun audio file header 
recognize title= album= artist= genre= track=

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-06-13 20:58:43 +02:00
Michael Niedermayer
4879841d15 avformat/dump: Show coded dimensions again 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-06-13 20:26:21 +02:00