Michael Niedermayer
fbc133915b
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Allow values >31bit for -analyzeduration.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-10 18:22:41 +02:00
Michael Niedermayer
3a76d7f73d
avformat/nutenc: cleaner version check
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-10 16:36:41 +02:00
Michael Niedermayer
d7f398c542
avformat/nutenc: Fix error handling in nut_write_packet()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-10 15:41:33 +02:00
Michael Niedermayer
0f0f626048
avformat/rawdec: Increase probe score when "Content-Type: image/jpeg" is found at the file start
...
Based-on code by: Carl Eugen Hoyos and Andrey Utkin
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-10 14:42:19 +02:00
Carl Eugen Hoyos
5482780a3b
Allow values >31bit for -analyzeduration.
2014-06-10 14:28:34 +02:00
Michael Niedermayer
ec2b6ee59a
avformat/utils: dont wait for a first dts on demuxers which have AVFMT_NOTIMESTAMPS set
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-10 14:22:13 +02:00
Michael Niedermayer
b45a451dbe
avformat/rawdec: mark raw vc1 and mjpeg as having no timestamps
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-10 14:21:24 +02:00
Michael Niedermayer
65571ee4e3
avformat/rawdec: add FF_DEF_RAWVIDEO_DEMUXER2, which allows specifying the flags
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-10 14:20:39 +02:00
Michael Niedermayer
2351ea8a2e
avformat/nutenc: Fix error handling in write_sm_data()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-10 04:00:06 +02:00
Carl Eugen Hoyos
958168d505
lavf/mpegts: Reduce number of "Predefined SLConfigDescriptor" warnings shown.
2014-06-09 23:20:14 +02:00
Michael Niedermayer
2d3842f541
avformat: add mjpeg_probe()
...
Fixes Ticket3679
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-09 17:52:44 +02:00
Michael Niedermayer
52e563bb2f
avformat/cavsvideodec: Fix probing when the file extension is avs
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-09 05:17:34 +02:00
Michael Niedermayer
7c3af60016
avformat/movenc: use av_malloc(z)_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-08 15:26:03 +02:00
Michael Niedermayer
b2d1e22c2a
avformat/udp: fix build on MINIX
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-07 14:43:07 +02:00
Michael Niedermayer
74760883fc
avformat/flvenc: Do not allow creating h263/mpeg4 in flv without unofficial format extensions being enabled.
...
Found-by: Jean-Baptiste Kempf <jb@videolan.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-07 12:03:31 +02:00
Vignesh Venkatasubramanian
c80181352c
lavf/matroskaenc: Fix Cues on Audio for WebM DASH
...
Fix a change that was broken by [1]. Cues must be added for audio frames
on cluster start for WebM when the DASH flag is passed. Restoring
correct functionality.
[1] http://goo.gl/xYLq7Z
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-06 21:36:11 +02:00
Michael Niedermayer
27b893b231
avformat/mov: fix "warning: variable altitude set but not used" warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-06 15:46:03 +02:00
Michael Niedermayer
a80342fe56
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Allow >2G for skip_initial_bytes.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-06 14:01:21 +02:00
Michael Niedermayer
a083543da0
Merge commit ' e7d6d0bf3c'
...
* commit 'e7d6d0bf3c
2014-06-06 13:24:30 +02:00
Martin Storsjö
e7d6d0bf3c
mov: Export geotag metadata fields
...
The '?xyz' form is used by android devices (and according to apple
mailing list archives, also by older iOS devices). The 'loci' field
(defined in 3GPP 26.244) is used by recent iOS devices.
Even though the loci field can contain an altitude, it was plain
0 in my sample. Just export longitude and latitude, in a string
format matching the one used by the '?xyz' metadata field.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-06-06 10:46:10 +03:00
Carl Eugen Hoyos
d58bcc1921
Allow >2G for skip_initial_bytes.
2014-06-06 09:16:53 +02:00
Michael Niedermayer
c7e54628e3
Merge commit ' 95b7fa1729'
...
* commit '95b7fa1729
2014-06-04 12:54:15 +02:00
Martin Storsjö
95b7fa1729
oggenc: Support flushing the muxer
...
This allows the caller to write all buffered data to disk, allowing
the caller to know at what byte position in the file a certain
packet starts (any packet written after the flush will be located
after that byte position).
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-06-04 12:21:10 +03:00
Michael Niedermayer
571ab8344a
avformat/avidec: allow rounding errors between scale/rate and timebase
...
Fixes Ticket3670
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-04 05:04:13 +02:00
Lou Logan
88f2586adb
fix various typos
...
Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03 10:58:19 -08:00
Michael Niedermayer
72e4ceeb79
avformat/asfdec: Use a parser for mpeg4-asp to find has_b_frames
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03 15:23:30 +02:00
Carl Eugen Hoyos
763e714442
Do not limit blocksize when reading PCM from aiff.
...
Fixes ticket #3695 .
2014-06-03 03:07:55 +02:00
Michael Niedermayer
1a426d5404
avformat/utils/avformat_find_stream_info: Move max_analyze_duration setup out of the packet loop
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-02 21:21:11 +02:00
Michael Niedermayer
6f6edfe1c0
avformat/utils: Call ff_rfps_add_frame() only for video
...
This avoids some unneeded computations
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-02 17:09:53 +02:00
Michael Niedermayer
bfb3ed1a9d
avformat/mux: Dont leave stale side data pointers in ff_interleave_add_packet()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-02 14:48:22 +02:00
Michael Niedermayer
74ece44373
avformat/mux: fix memleak of side data in flac fate tests
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-02 14:38:03 +02:00
Carl Eugen Hoyos
f284e85714
Report "unknown codec" instead of "unspecifed size" if the codec is unknown.
2014-06-02 08:33:40 +02:00
Michael Niedermayer
e91f27cbbb
Merge commit ' 59cb5747ec'
...
* commit '59cb5747ec
2014-06-02 00:32:30 +02:00
Michael Niedermayer
6b9cbc9a11
Merge commit ' 3b18857ab3'
...
* commit '3b18857ab3
2014-06-01 23:56:22 +02:00
Michael Niedermayer
8225bf95bc
Merge commit ' a1859032e3'
...
* commit 'a1859032e3
2014-06-01 23:51:41 +02:00
Uwe L. Korn
59cb5747ec
rtmpproto: read metadata to set correct FLV header
...
In the presence of no metadata, do not set any stream flag in the FLV
header but let the demuxer handle the detection and creation of streams
as data arrives.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-06-01 23:30:48 +03:00
Uwe L. Korn
3b18857ab3
rtmppkt: Add method to read an AMF string that is not prefixed by its type
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-06-01 23:30:33 +03:00
Uwe L. Korn
a1859032e3
flvdec: Do not default to a video and audio stream
...
If no streams were indicated in the FLV header, do not automatically
allocate by default a video and an audio stream. Instead, in the case
that the header did not indicate the presence of any data, allocate no
stream until data actually arrives for one type.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-06-01 23:29:40 +03:00
Michael Niedermayer
955b31a751
Merge commit ' e19d48dfce'
...
* commit 'e19d48dfce
2014-06-01 14:16:29 +02:00
Michael Niedermayer
855e3b5700
Merge commit ' 0097cbea69'
...
* commit '0097cbea69
2014-06-01 14:12:04 +02:00
Michael Niedermayer
754bf1212c
Merge commit ' d2ef708c95'
...
* commit 'd2ef708c95820ffaed0f
2014-06-01 12:00:20 +02:00
Anton Khirnov
e19d48dfce
flac muxer: support reading updated extradata from side data
2014-06-01 08:32:33 +02:00
Anton Khirnov
0097cbea69
flac muxer: accept only STREAMINFO extradata
...
The other format (full flac header blocks) should not be exported by any
demuxers anymore.
This allows to drop an avpriv_ function and also simplify the following
commits.
2014-06-01 08:31:33 +02:00
Tudor Suciu
d2ef708c95
matroskaenc: Allow VP9 and Opus in webm
...
Bug-Id: 695
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-06-01 07:50:00 +02:00
Carl Eugen Hoyos
26b0d7198e
Read mov files where the moov atom is hidden within a free atom.
...
Fixes ticket #1551 / issue 2226.
2014-05-31 16:57:27 +02:00
Carl Eugen Hoyos
aab2e939a9
Fix compilation with --disable-everything --enable-demuxer=matroska.
...
Fixes ticket #3693 .
2014-05-31 16:29:02 +02:00
Carl Eugen Hoyos
6e67852881
Use rc_max_rate in av_find_best_stream() if bitrate == 0.
...
Fixes ticket #2042 .
2014-05-31 13:41:10 +02:00
John Peebles
925f7980eb
libavformat: output cues for each subtitle block in MKV muxer
...
Signed-off-by: John Peebles <johnpeeb@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-31 13:26:48 +02:00
Michael Niedermayer
9c22e909ed
Revert "avformat/movenchint: Fix movhinting with ff_rtp_chain_mux_open() from abb810db03"
...
This has become unneeded due to f797b134ca1fe40e1b05
2014-05-31 12:54:00 +02:00
Michael Niedermayer
8c895ae73f
Merge commit ' f797b134ca'
...
* commit 'f797b134ca1fe40e1b05
2014-05-31 12:53:46 +02:00
