Michael Niedermayer
b28fcbba0c
Merge commit ' 9279826008'
...
* commit '9279826008
2014-07-04 00:50:40 +02:00
Michael Niedermayer
a9ce5d92e6
Merge commit ' 0955e57ad0'
...
* commit '0955e57ad0
2014-07-03 21:42:16 +02:00
Anton Khirnov
9279826008
id3v2enc: use a case-insensitive comparison for APIC picture type
2014-07-03 18:40:37 +00:00
Nidhi Makhijani
0955e57ad0
daud: split muxer and demuxer
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-07-03 10:46:11 -07:00
Carl Eugen Hoyos
d538dd824e
avformat: Add image3 demuxers with format autodetection
...
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-03 18:14:06 +02:00
James Zern
dea377fcc0
ivfenc: support VP9
...
libvpx tools accept vp9 ivf files
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-03 15:46:26 +02:00
Michael Niedermayer
a3c479fc49
avformat/avformat: minor grammar improvement
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-03 13:51:53 +02:00
Michael Niedermayer
44f079b27e
Merge commit ' cdab9db2ad'
...
* commit 'cdab9db2ad61f96be08a
2014-07-03 13:39:23 +02:00
Vittorio Giovara
cdab9db2ad
lavf: document av_dump_format()
2014-07-02 23:37:21 -04:00
Carl Eugen Hoyos
b02cfad7d2
Fix standalone compilation of the wtv muxer.
2014-07-02 23:41:29 +02:00
Michael Niedermayer
98569d8963
matroskadec: Fix a double negation typo
...
This typo has existed since this code was added in c16582579
2014-07-02 20:15:42 +03:00
Michael Niedermayer
141ee10913
Merge commit ' 48e6432407'
...
* commit '48e6432407
2014-07-01 20:55:42 +02:00
Michael Niedermayer
ee78b0c252
Merge commit ' b75a1f9892'
...
* commit 'b75a1f9892
2014-07-01 20:25:35 +02:00
Michael Niedermayer
8365287e61
Merge commit ' f1f6156b3f'
...
* commit 'f1f6156b3f
2014-07-01 19:58:57 +02:00
Luca Barbato
48e6432407
matroska: Factor out mkv_write_stereo_mode
2014-07-01 16:43:20 +02:00
Luca Barbato
b75a1f9892
matroska: Factor out write_track from mkv_write_tracks
2014-07-01 16:43:01 +02:00
Luca Barbato
f1f6156b3f
matroska: K&R formatting cosmetics
2014-07-01 16:42:32 +02:00
Michael Niedermayer
fb318def5d
Merge commit ' 20f95f21f9'
...
* commit '20f95f21f9
2014-07-01 16:31:57 +02:00
Yusuke Nakamura
20f95f21f9
mov: Support default-base-is-moof.
...
default-base-is-moof shall be set to track fragments compatible with DASH
Media Segments. So, this is a fundamental support for ISOBMFF ver. DASH.
This is meaningful only when base-data-offset-present is absent and two or
more track fragments are present in a movie fragment.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-07-01 14:36:06 +03:00
Michael Niedermayer
f054d1e7ae
avformat/hdsenc: Use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-30 05:08:33 +02:00
Michael Niedermayer
ca384d708b
avformat/rtsp: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-30 05:08:16 +02:00
Michael Niedermayer
e6aba1be4c
avformat/options_table: Fix flush_packet flag flags
...
Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-28 21:24:15 +02:00
Michael Niedermayer
c599c211fb
avformat/mux: fix flush_packets flag with flushing buffers
...
Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-28 21:23:32 +02:00
Michael Niedermayer
823ea19a74
Merge commit ' 39975acc69'
...
* commit '39975acc69
2014-06-28 12:40:01 +02:00
Vittorio Giovara
39975acc69
rtpenc_jpeg: check for color_range too
2014-06-28 01:51:14 -04:00
Gaullier Nicolas
134beb9e02
avformat/mxfenc: rename very recently added option to set/force channelcount in MXF D-10
...
Approved-by: Tomas Härdin <tomas.hardin@codemill.se>
Approved-by: tim nicholson <nichot20@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-27 03:29:51 +02:00
Michael Niedermayer
af75a85599
Merge commit ' 3f4edf0125'
...
* commit '3f4edf012575511c293a
2014-06-26 21:03:21 +02:00
Anton Khirnov
3f4edf0125
dump_stream: print the timebase as is, do not reduce it
...
It makes more sense to print the timebase exactly as it is set. Also,
this avoids a divide by zero when av_dump_format() is called on a format
context before writing the header.
2014-06-26 16:04:22 +02:00
Gaullier Nicolas
3eae34d50f
avformat/mxfenc: set/force channelcount in MXF D-10
...
There are interoperability issues with D-10 related to the channelcount property in the generic sound essence descriptor.
On one side, SMPTE 386M requires channel count to be 4 or 8, other values being prohibited.
The most widespread value is 8, which seems straightforward as it is the actual size of the allocated structure/disk space.
At the end, it appears that some vendors or workflows do require this descriptor to be 8, and otherwise just "fail".
On the other side, at least AVID and ffmpeg do write/set the channel count to the exact number of channels really "used",
usually 2 or 4, or any other value. And on the decoding side, ffmpeg (for example) make use of the channel count for probing
and only expose this limited number of audio streams
(which make sense but has strong impact on ffmpeg command line usage, output, and downstream workflow).
At the end, I find it pretty usefull to simply give ffmpeg the ability to force/set the channel count to any value the user wants.
(there are turnaround using complex filters, pans, amerge etc., but it is quite boring and requires the command line to be adapted to the input file properties)
Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-26 01:01:22 +02:00
Michael Niedermayer
74bd039f8c
avformat/nutdec: improve probe speed by 30%
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-24 18:40:40 +02:00
Michael Niedermayer
501158c682
avformat/wavenc: simplify malloc failure checking
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-24 13:51:40 +02:00
Michael Niedermayer
3bd0221bc1
avformat/wavenc: more specific error return for "Writing 16 bit peak for 8 bit audio"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-24 13:50:38 +02:00
Michael Niedermayer
d34d3304a8
avformat/wavenc: do not hardcode array size in memset and other functions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-24 13:38:47 +02:00
Michael Niedermayer
2e1e10a6bb
avformat/wavenc: use the bitexact flag from avformat instead of the one from avcodec
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-24 13:32:27 +02:00
Georg Lippitsch
fd504f7c6f
Peak Envelope Chunk encoder: Indent
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-24 04:37:02 +02:00
Georg Lippitsch
e3b03da772
EBU Tech 3285 - Supplement 3 - Peak Envelope Chunk encoder
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-24 04:30:29 +02:00
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
