Carl Eugen Hoyos
54bbe3e2a6
Revert "Allow stream-copying grayscale mov files."
...
This reverts commit 691dec6201#3215 , it was fixed one commit earlier.
The revert may break other use-cases but they should be fixed differently,
the offending commit introduced too many problems.
Fixes ticket #3377 .
Fixes ticket #3378 .
2014-03-11 20:09:07 +01:00
Michael Niedermayer
5d75730c58
avformat/avidec: Check required demuxing buffer sizes in guess_ni_flag()
...
Fixes Ticket3421
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-11 19:20:47 +01:00
Michael Niedermayer
01000064c9
avidec: calculate missing bitrates from index
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-11 19:20:47 +01:00
Anshul Maheshwari
61f96be08a
Documented av_dump_format
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-11 13:24:53 +01:00
Matt Oliver
99b48fd448
Fix modplug linkage on Windows.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-11 13:22:49 +01:00
Michael Niedermayer
4775424446
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Define ff_log2_run[] in libavcodec/internal.h.
Replace an incorrect av_free() in movenc.c with av_freep().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-11 00:53:24 +01:00
Michael Niedermayer
7f90055470
Merge commit ' 34bbc81de8'
...
* commit '34bbc81de8
2014-03-10 23:38:01 +01:00
Michael Niedermayer
b73cf4eb15
Merge commit ' ee17be3fdd'
...
* commit 'ee17be3fdd
2014-03-10 22:51:49 +01:00
Tim Walker
34bbc81de8
lavf: simplify ff_hevc_annexb2mp4_buf
...
Use ff_hevc_annexb2mp4 instead of duplicating
its functionality, and update the documentation
to match the new behavior.
2014-03-10 18:02:36 +01:00
Carl Eugen Hoyos
d68ac92dc2
Replace an incorrect av_free() in movenc.c with av_freep().
2014-03-10 13:30:51 +01:00
Michael Niedermayer
4c63beeefe
Merge commit ' 8cafeb8bca'
...
* commit '8cafeb8bca423089e964
2014-03-10 11:51:40 +01:00
Luca Barbato
ee17be3fdd
hevc: Use get_se_golomb_long
...
Do not use inline functions that refer to tables present in other
libraries.
2014-03-10 10:59:48 +01:00
Martin Storsjö
8cafeb8bca
mxfdec: Validate parameters to strftime
...
The MSVCRT version of strftime calls the invalid parameter handler
if the struct values in struct tm are invalid. In case no invalid
parameter handler is set for the process, the process is aborted.
This fixes fate failures on MSVC builds since 570af382
2014-03-10 11:11:08 +02:00
Michael Niedermayer
fb0023639e
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
matroskaenc: enable Annex B to MP4 conversion for HEVC tracks.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-09 23:41:02 +01:00
Michael Niedermayer
38aee6408a
Merge commit ' a823d09486'
...
* commit 'a823d09486
2014-03-09 23:34:17 +01:00
Michael Niedermayer
88c8e4afea
avformat/hevc: fix mix of av_malloc() with free()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-09 23:27:31 +01:00
Michael Niedermayer
9563e67e07
Merge commit ' 4f3db5d341'
...
* commit '4f3db5d341
2014-03-09 23:13:37 +01:00
Michael Niedermayer
5d5e2bd862
avformat/hevc: Make return codes consistent and more flexible
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-09 23:12:45 +01:00
Michael Niedermayer
a379813cee
Merge commit ' b6c61fb83e'
...
* commit 'b6c61fb83e
2014-03-09 23:08:33 +01:00
Michael Niedermayer
cb403b2570
avformat: fix hevcs use of golomb from avformat
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-09 22:59:46 +01:00
Michael Niedermayer
1b1d77ae9b
Merge commit ' 20b40a597c'
...
* commit '20b40a597c
2014-03-09 22:48:08 +01:00
Michael Niedermayer
ce1ad8d775
Merge commit ' 1d9014f0b0'
...
* commit '1d9014f0b0
2014-03-09 22:31:55 +01:00
Michael Niedermayer
858d9947e4
Merge commit ' 8a0bc40545'
...
* commit '8a0bc40545e26b066cd8
2014-03-09 22:25:41 +01:00
Michael Niedermayer
6783b3eb76
avformat/isom: remove duplicated line
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-09 22:12:37 +01:00
Michael Niedermayer
2f41b18696
Merge commit ' eeae858596'
...
* commit 'eeae8585965b9f39860d6e65e34837
2014-03-09 22:11:08 +01:00
Tim Walker
558b20d729
matroskaenc: enable Annex B to MP4 conversion for HEVC tracks.
2014-03-09 18:09:40 +01:00
Tim Walker
a823d09486
matroskaenc: write private data in hvcC format for HEVC.
2014-03-09 18:09:40 +01:00
Tim Walker
4f3db5d341
movenc: allow muxing HEVC in MODE_MP4.
2014-03-09 18:09:40 +01:00
Tim Walker
b6c61fb83e
movenc: enable Annex B to MP4 conversion for HEVC tracks.
2014-03-09 18:09:40 +01:00
Tim Walker
20b40a597c
movenc: write hvcC tag for HEVC.
2014-03-09 18:09:40 +01:00
Tim Walker
1d9014f0b0
movenc: use 'hev1' tag for HEVC in MODE_MOV.
...
'hvc1' requires that parameter set NAL units be
present only in the samples entry, but not in the
samples themselves, requiring that additional
parameter sets, if present, be filtered out of the
samples and placed in new, additional sample entries
if they override or otherwise conflict with the
parameter sets present in the first sample entry.
We do not have any way of doing this at present, so
the files we produce can only comply with the
restrictions set for the 'hev1' sample entry name in
ISO/IEC 14496-15.
2014-03-09 18:09:40 +01:00
Piotr Bandurski
8a0bc40545
libspeex: support ZygoAudio (quality 10 mode)
2014-03-09 18:09:39 +01:00
James Zern
3e0175d89a
riff: add VP9 fourcc
2014-03-09 18:09:39 +01:00
Mark Himsley
360022bd3b
isom: lpcm in mov default to big endian
...
It is my understanding that "Unless otherwise stated, all data in a
QuickTime movie is stored in big-endian byte ordering" [1] in MOV files.
I have a couple of thousand files, which technically are invalid because
their sound sample description element 4CC is 'lpcm' but its version is
0 - and "Version 0 supports only uncompressed audio in raw ('raw ') or
twos-complement ('twos') format" [2]
Because isom.c only contains a mapping for 4CC 'lpcm' to
AV_CODEC_ID_PCM_S16LE, these files have their audio decoded as LE when
it is actually BE.
This commit adds AV_CODEC_ID_PCM_S16BE as the first match for 4CC 'lpcm'.
[1]
https://developer.apple.com/library/mac/documentation/quicktime/QTFF/qtff.pdf
page 21
[2]
https://developer.apple.com/library/mac/documentation/quicktime/QTFF/qtff.pdf
page 178
Reviewed-by: Yusuke Nakamura <muken.the.vfrmaniac@gmail.com>
2014-03-09 18:09:39 +01:00
Ben Littler
fb0a988f94
riff: IPJ2 decodes with JPEG2000 decoder
...
Samples can be made from mencoder and jp2avi.dll codec.
2014-03-09 18:09:39 +01:00
Piotr Bandurski
db32f14c3d
isom: add "MNG" FourCC
2014-03-09 18:09:39 +01:00
Baptiste Coudurier
9e71cc81f3
movdec: handle 0x7fff langcode as macintosh per the specs
...
The correct point that seperates ISO and MAC language codes is 0x400
according to the current QT spec. Old QT specs did not list where this
seperation is but apparently only defined the meaning of the first 137.
2014-03-09 18:09:39 +01:00
Carl Eugen Hoyos
073cd30fb4
isom: Support MPEG-2 video mov files from FPC5
2014-03-09 18:09:39 +01:00
Piotr Bandurski
31e558fbcf
isom: add "NO16" FourCC
2014-03-09 18:09:39 +01:00
Carl Eugen Hoyos
eeae858596
isom: Support Sony XAVC in mov
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-03-09 18:09:38 +01:00
Piotr Bandurski
6509012398
isom: add Radius DV YUV FourCCs
2014-03-09 18:09:38 +01:00
Ben Littler
c09804684a
isom: add xd51 hdcam
...
Someone needs to binary search FCP for new isom...
2014-03-09 18:09:38 +01:00
Michael Niedermayer
9827f3db88
Merge commit ' 565e0c6d86'
...
* commit '565e0c6d86
2014-03-09 01:50:17 +01:00
Michael Niedermayer
4cb6814160
Merge commit ' 0092c1dd8d'
...
* commit '0092c1dd8d
2014-03-09 01:41:55 +01:00
John Stebbins
565e0c6d86
movenc: allow override of "writing application" tag
...
Signed-off-by: Tim Walker <tdskywalker@gmail.com>
CC: libav-stable@libav.org
2014-03-08 18:59:35 +01:00
John Stebbins
0092c1dd8d
matroskaenc: allow override of "writing application" tag
...
Signed-off-by: Tim Walker <tdskywalker@gmail.com>
CC: libav-stable@libav.org
2014-03-08 18:56:49 +01:00
Nicolas George
6bffa83bbe
lavf/concatdec: reindent after last commit.
2014-03-08 12:44:45 +01:00
Nicolas George
8a670f52a5
lavf/concatdec: more reliable test for absolute URLs.
...
ff_make_absolute_url() recognizes the "://" pattern usual
in HTTP-like protocols, but consider relative URLs starting
with just the protocol name or using the comma syntax for
options.
2014-03-08 12:38:31 +01:00
Nicolas George
97e87e09c8
lavf: add subfile protocol.
2014-03-08 12:36:57 +01:00
Michael Niedermayer
fabf69f37a
Merge commit ' f69befe5ee'
...
* commit 'f69befe5ee
2014-03-08 00:13:20 +01:00
