Michael Niedermayer
ca350378de
Merge commit ' f2f2e7627f'
...
* commit 'f2f2e7627f2dd0da787c
2014-06-23 03:34:13 +02:00
Justin Ruggles
f2f2e7627f
Check mp3 header before calling avpriv_mpegaudio_decode_header().
...
As indicated in the function documentation, the header MUST be
checked prior to calling it because no consistency check is done
there.
CC:libav-stable@libav.org
2014-06-22 20:31:58 -04:00
Michael Niedermayer
9e8c92226f
Merge commit ' 85d805d5cc'
...
* commit '85d805d5cc
2014-06-23 00:31:22 +02:00
Michael Niedermayer
738272826f
Merge commit ' 03391b5432'
...
* commit '03391b5432
2014-06-23 00:19:41 +02:00
Michael Niedermayer
2ca4802601
Merge commit ' 49470b9404'
...
* commit '49470b9404
2014-06-23 00:13:34 +02:00
Diego Biurrun
73953df71a
Replace av_malloc() and memset(0) by av_mallocz()
2014-06-22 18:43:11 +02:00
Diego Biurrun
85d805d5cc
build: Add missing object files for webm muxer
2014-06-22 06:28:46 -07:00
Diego Biurrun
03391b5432
build: Add missing object files for Matroska demuxer
2014-06-22 06:28:46 -07:00
Diego Biurrun
49470b9404
build: Add missing replaygain object file for CAF demuxer
2014-06-22 06:28:45 -07:00
Michael Niedermayer
dc5972f886
avformat/flvdec: give live_flvdec a separate name
...
This should fix a infinite loop on freebsd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-21 20:27:45 +02:00
Carl Eugen Hoyos
e3fd263f0b
Show duration for large asf files as written in the file header.
...
Fixes ticket #3428 .
2014-06-21 20:00:18 +02:00
Diego Biurrun
97578f5f3b
build: Add missing object file for Matroska demuxer
...
Fixes compilation with --disable-everything --disable-network --enable-demuxer=matroska
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
2014-06-21 11:53:43 +02:00
Moritz Barsnick
10b8481a26
fix several typos
2014-06-20 10:21:31 -08:00
Gaullier Nicolas
650ef18078
avformat/utils: better probing for duration in estimate_timings_from_pts()
...
It seems it is more secure to simply duplicate the computing routine from compute_pkt_fields to estimate_timings_from_pts.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-19 20:48:46 +02:00
James Almer
4c9ee1590f
lavf/Makefile: fix standalone compilation of live_flv demuxer
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-19 13:25:28 +02:00
Michael Niedermayer
dacc4cb115
Merge commit ' c385313d25'
...
* commit 'c385313d25
2014-06-18 23:27:01 +02:00
Michael Niedermayer
be94f5c171
Merge commit ' c9c1e00f95'
...
* commit 'c9c1e00f95
2014-06-18 23:22:12 +02:00
Joshua Kordani
c385313d25
rtsp: Support misordered fmtp rtpmap
...
Issue present in Avigilon IP cameras.
2014-06-18 22:03:40 +02:00
Luca Barbato
c9c1e00f95
rtsp: Factor out fmtp parsing
2014-06-18 22:03:40 +02:00
Michael Niedermayer
1d54f51084
avformat/mux: simplify ff_choose_timebase()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18 20:09:55 +02:00
Michael Niedermayer
75511c293a
dump_stream_format: fix division by 0
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18 19:49:23 +02:00
Michael Niedermayer
ac293b6685
Merge commit ' 194be1f43e'
...
* commit '194be1f43e
2014-06-18 19:49:17 +02:00
Michael Niedermayer
2d70282254
Merge commit ' d754ed4172'
...
* commit 'd754ed4172
2014-06-18 17:47:12 +02:00
Michael Niedermayer
95398aa949
Merge commit ' f792d3cbb8'
...
* commit 'f792d3cbb8
2014-06-18 17:28:10 +02:00
Michael Niedermayer
bd148ce07d
Merge commit ' cfbdd7ffbd'
...
* commit 'cfbdd7ffbd
2014-06-18 17:27:06 +02:00
Anton Khirnov
194be1f43e
lavf: switch to AVStream.time_base as the hint for the muxer timebase
...
Previously, AVStream.codec.time_base was used for that purpose, which
was quite confusing for the callers. This change also opens the path for
removing AVStream.codec.
The change in the lavf-mkv test is due to the native timebase (1/1000)
being used instead of the default one (1/90000), so the packets are now
sent to the crc muxer in the same order in which they are demuxed
(previously some of them got reordered because of inexact timestamp
conversion).
2014-06-18 15:12:34 +02:00
Anton Khirnov
d754ed4172
riffenc: take an AVStream instead of an AVCodecContext
...
It will be useful in the following commits.
Also, rename the AVCodecContext pointer name from 'stream' to 'codec'.
2014-06-18 15:03:55 +02:00
Anton Khirnov
f792d3cbb8
lavf: add the notimestamps flag to the muxers missing it
2014-06-18 15:03:31 +02:00
Anton Khirnov
cfbdd7ffbd
rtpenc: base max_frames_per_packet on avg_frame_rate, not codec timebase
...
Fall back to 1 (which is what is used for most cases anyway) when the
framerate is not set.
2014-06-18 15:03:16 +02:00
Anton Khirnov
894682a973
Remove avserver.
...
It has not been properly maintained for years and there is little hope
of that changing in the future.
It appears simpler to write a new replacement from scratch than
unbreaking it.
2014-06-18 14:55:28 +02:00
Michael Niedermayer
3f2f87cd5a
Merge commit ' 74bc945805'
...
* commit '74bc945805
2014-06-18 01:44:24 +02:00
Josh Allmann
74bc945805
flvenc: Don't over-count metadata.
...
Over-counting occurs if framerate is not set.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-06-17 21:38:21 +02:00
Michael Niedermayer
2fbdfba0f2
avformat/flvdec: Support live flv / NGINX RTMP streams
...
Fixes Ticket3553
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-16 23:43:11 +02:00
Michael Niedermayer
f0fbd9105b
Merge commit ' 711aa2a827'
...
* commit '711aa2a827
2014-06-16 12:54:36 +02:00
Michael Niedermayer
7b7afaf849
avformat/dump: put copyright back from the file from which dump.c was split out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-16 12:48:19 +02:00
Michael Niedermayer
83d100baea
Merge commit ' 2dc265619a'
...
* commit '2dc265619a
2014-06-16 12:48:03 +02:00
Michael Niedermayer
c1b15c16ef
avformat/smoothstreamingenc: Use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-15 23:21:46 +02:00
Michael Niedermayer
153b5fb2fd
avformat/framecrcenc: print the checksum and size of extradata as well
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-15 18:07:03 +02:00
Michael Niedermayer
86a9370e2b
avformat/mpc: attempt to allocate a packet that is not smaller than the data inside it
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-15 01:33:17 +02:00
Vittorio Giovara
711aa2a827
lavf: dump stream side data when probing
2014-06-14 00:25:26 -04:00
Vittorio Giovara
2dc265619a
lavf: group dump functions together
2014-06-14 00:24:35 -04:00
Michael Niedermayer
c600c8e966
Merge commit ' dca7ba4bff'
...
* commit 'dca7ba4bff
2014-06-12 20:25:48 +02:00
Diego Biurrun
dca7ba4bff
Remove some unnecessary CONFIG_FOO_COMPONENT ifdefs
...
The files are only ever compiled if that condition is true.
2014-06-12 07:10:18 -07:00
Michael Niedermayer
27b8ef5bb7
avformat/oggparsevorbis: Dont attempt to calculate timestamps from gp=0
...
Fixes Ticket3710
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-11 18:12:14 +02:00
Michael Niedermayer
aff0912da5
Merge commit ' f121dbd9f7'
...
* commit 'f121dbd9f7
2014-06-10 23:55:57 +02:00
Michael Niedermayer
2d99b4041f
Merge commit ' 3f7e94eccd'
...
* commit '3f7e94eccd
2014-06-10 23:27:16 +02:00
Luca Barbato
f121dbd9f7
mpegts: Provide an option to override the pcr period
...
Certain hardware demuxer have specific restrictions for PCR periodicity.
2014-06-10 22:05:44 +02:00
Luca Barbato
3f7e94eccd
mpegts: Move the option section to the bottom
...
Makes it consistent with the rest of the formats and ease usage
of macros constants for the defaults.
2014-06-10 22:05:44 +02:00
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
