Daniel Verkamp
cf3fccce06
ff_put_wav_header: remove manual byte counting
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-18 15:54:37 +01:00
Michael Niedermayer
7ae5cadb0a
Merge commit 'ca80e15814b77efe8d0ff5a5b0220754bb6c4065'
...
* commit 'ca80e15814b77efe8d0ff5a5b0220754bb6c4065':
mpegts: Forward error codes in various functions
Conflicts:
libavformat/mpegts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-18 13:30:20 +01:00
Michael Niedermayer
ceb0d79f46
Merge commit '86ba2327e1cf35c6f77d5fb516a1a7a8dce0b98a'
...
* commit '86ba2327e1cf35c6f77d5fb516a1a7a8dce0b98a':
mpegts: K&R formatting cosmetics
Conflicts:
libavformat/mpegts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-18 13:19:24 +01:00
Keiji Costantini
ca80e15814
mpegts: Forward error codes in various functions
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-03-18 08:20:35 +01:00
Keiji Costantini
86ba2327e1
mpegts: K&R formatting cosmetics
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-03-18 08:07:43 +01:00
Michael Niedermayer
e21235f9b9
avformat/mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions from tkhd
...
This also moves mov_rewrite_dvd_sub_extradata() to mov.c
Fixes: NeroRecodeSample.mp4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 18:36:25 +01:00
Michael Niedermayer
8ba432bc56
avformat/mov: fill in subtitle dimensions after parsing tkhd
...
Sample: NeroRecodeSample.mp4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 18:21:11 +01:00
Michael Niedermayer
b6ad5893ce
avformat/isom: only write the size if its non zero in mov_rewrite_dvd_sub_extradata()
...
Fixes regression with NeroRecodeSample.mp4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 17:09:33 +01:00
Michael Niedermayer
f6f3c85c0e
avformat/isom: Simplify mov_rewrite_dvd_sub_extradata()
...
This avoids the 2nd buffer and fixes the palette truncated check
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 17:06:30 +01:00
Michael Niedermayer
c738ffcf2c
Merge commit '58c215961a9067bb670387bbd72286c30de04b93'
...
* commit '58c215961a9067bb670387bbd72286c30de04b93':
raw, nut: Support rgba64 encoding
Conflicts:
libavcodec/raw.c
libavformat/nut.c
See: edf34c346e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 15:43:55 +01:00
Jean First
6d78e852fb
img2: add j2c file extension
...
Some applications use the j2c extension for jpeg2000 codestream files.
2014-03-16 23:31:29 +01:00
Carl Eugen Hoyos
58c215961a
raw, nut: Support rgba64 encoding
2014-03-16 23:29:51 +01:00
Michael Niedermayer
6d7b22fb8f
isom: fix C99-style declaration
2014-03-16 23:05:48 +01:00
Michael Niedermayer
0efacc7f9a
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
aacdec: Lower the number of frames required to detect ADTS
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-16 22:38:05 +01:00
Michael Niedermayer
6dd007ad99
Merge commit '0412cb67cda05b08dfca6bfc4ff664ea917fa932'
...
* commit '0412cb67cda05b08dfca6bfc4ff664ea917fa932':
aacdec: Don't count probed ADTS frames if there are false positives
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-16 22:25:15 +01:00
Martin Storsjö
3b1c9eb0ff
aacdec: Lower the number of frames required to detect ADTS
...
For live audio streams, requiring 500 frames for a stream to
be detected is a bit overkill.
This allows live ADTS streams that don't start nicely at
a frame boundary to start up more quickly, e.g.
http://mp3.streampower.be/radio1.aac .
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-03-16 21:04:00 +02:00
Martin Storsjö
0412cb67cd
aacdec: Don't count probed ADTS frames if there are false positives
...
If a portion of the probe buffer seem to resemble ADTS frames,
but some data at the end is a mismatch, disregard the whole
probing attempt. If it actually is ADTS data, there shouldn't be
any mismatches within the sequential frame data.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-03-16 20:58:41 +02:00
Peter Ross
40f88796c6
Phantom Cine demuxer (iteration 2014.3)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-16 18:24:30 +01:00
Michael Niedermayer
9b1d264e87
avformat/movenc: omit avformat ident from isml_manifest for bitexact mode
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-16 16:34:46 +01:00
Michael Niedermayer
10c14264db
avformat/movenc: omit LIBAVCODEC_IDENT for bitexact mode from uuidusmt_tag
...
This code is apparently not tested by fate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-16 16:33:34 +01:00
Michael Niedermayer
a17ee4117d
avformat/movenc: only ommit encoder tag of the metadata for bitexact mode
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-16 16:26:35 +01:00
Michael Niedermayer
cd0982e189
avformat/isom: fix mix of declaration and statement
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-16 14:05:14 +01:00
Michael Niedermayer
09680951df
Merge commit '8f629a986c46f227abda1811a6ad1f449871ca35'
...
* commit '8f629a986c46f227abda1811a6ad1f449871ca35':
isom: convert mp4 dvdsub extradata to vobsub format
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-16 13:34:38 +01:00
wm4
8f629a986c
isom: convert mp4 dvdsub extradata to vobsub format
...
mp4 files embedding DVD subtitles do not use the same extradata format
as the rest of Libav expects. The subtitle decoder in libavcodec in
particular does not understand this format.
Convert the extradata to the vobsub .idx format. mp4 stores the palette
as binary 32 bit ints in YUV. The subtitle resolution is stored
separately in the track header, which we access through AVStream.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-03-15 14:32:58 +01:00
Peter Ross
847d8af59a
avformat/id3v2: decode compilation metadata
...
Described http://id3.org/iTunes%20Compilation%20Flag
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-15 04:29:19 +01:00
Peter Ross
ac9bfb1faf
avformat/movenc: encode compilation metadata
...
Fixes ticket #2960 .
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-15 04:29:11 +01:00
Peter Ross
dadf668df2
avformat/mov: decode compilation metadata
...
This flag is known as 'Part of a compilation' in Apple iTunes.
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-15 04:28:58 +01:00
Michael Niedermayer
b5bdd04f08
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
aac: K&R formatting cosmetics
Conflicts:
libavformat/aacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 12:00:45 +01:00
Luca Barbato
afdf94689c
aac: K&R formatting cosmetics
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-03-14 01:24:31 +01:00
Michael Niedermayer
bb6de15d92
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avconv: Match stream id
Conflicts:
cmdutils.c
doc/fftools-common-opts.texi
See: ea07063fd8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-13 14:21:27 +01:00
Michael Niedermayer
72d44f1583
mvformat/movenc: fix IMX
...
fixes Ticket3351
Tested-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-13 01:28:43 +01:00
Michael Niedermayer
11ed7ec092
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
http: Properly initialize icy headers string
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 23:24:19 +01:00
Michael Niedermayer
7e6c6c45ec
Merge commit 'e77a2ea9505863e50bf013706f66bf8b7325e524'
...
* commit 'e77a2ea9505863e50bf013706f66bf8b7325e524':
http: Declare more parameters as const where possible
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 20:50:29 +01:00
Alessandro Ghedini
6998a9f4c4
http: Properly initialize icy headers string
...
The icy_metadata_headers string never gets initialized, so,
during the first call to av_strlcatf() in parse_icy(),
strlen() will be called on a pointer to uninitialized memory.
At best this causes some garbage data to be left at the
start of the string.
By initializing icy_metadata_headers to the empty string, the
first call to strlen() will always return 0, so that data is
appended from the start of the string.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-03-12 20:13:36 +01:00
Fred Rothganger
3f3229cd10
avformat: extracting NTP timestamp from RTCP
...
For muxing, it accepts
both 0 and AV_NOPTS_VALUE. For demuxing, it will present
AV_NOPTS_VALUE when start_time_realtime is unknown.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 13:33:14 +01:00
Bryce McLeod
581957cd86
avformat/movenc: rescale when copying duration to timecode track
...
Fixes Ticket3453
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 12:52:27 +01:00
Martin Storsjö
e77a2ea950
http: Declare more parameters as const where possible
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-03-12 13:24:58 +02:00
Michael Niedermayer
3ddf76ee07
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Revert "Allow stream-copying grayscale mov files."
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 12:20:06 +01:00
Michael Niedermayer
1f36ebf63a
avformat: revert %c changes from d92024f18f
...
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 05:09:28 +01:00
Michael Niedermayer
cd25412f59
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
http: Allow setting a Content-Type for POST requests
Conflicts:
libavformat/http.c
See: c01d1d4ddf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 04:53:54 +01:00
Michael Niedermayer
1cc9468289
Merge commit 'ab76d9f628ad46e1d3bbf26c5bf1f87083f239ab'
...
* commit 'ab76d9f628ad46e1d3bbf26c5bf1f87083f239ab':
http: Always allow no-op seek
Conflicts:
libavformat/http.c
See: 857841c1b6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 04:29:54 +01:00
Michael Niedermayer
76a939d0e5
Merge commit '2ec33d27127251bbc45e1f88e60691ad59cf2319'
...
* commit '2ec33d27127251bbc45e1f88e60691ad59cf2319':
http: Add support for selecting a request range
Conflicts:
doc/protocols.texi
libavformat/http.c
See: d52882faef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 04:12:30 +01:00
Michael Niedermayer
f36da16ede
Merge commit 'ddfc98906373d1f17f6205cedd14c68d7a75995f'
...
* commit 'ddfc98906373d1f17f6205cedd14c68d7a75995f':
http: Support setting custom User-Agent
Conflicts:
doc/protocols.texi
libavformat/http.c
See: 2bb1c713cc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 03:45:16 +01:00
Michael Niedermayer
c03af3ac1c
Merge commit 'e58c85b0686892960042232e51c77168b264838a'
...
* commit 'e58c85b0686892960042232e51c77168b264838a':
http: Export Content-Type information
Conflicts:
doc/protocols.texi
libavformat/http.c
See: 76d851b656
See: 20899c54f0
See: 255ec768da
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 03:33:14 +01:00
Michael Niedermayer
ca2369cdee
Merge commit '8075c3d8bb1f6aade0cc7c5c40db9bc1bcd84cab'
...
* commit '8075c3d8bb1f6aade0cc7c5c40db9bc1bcd84cab':
http: Add support reading ICY metadata
Conflicts:
doc/protocols.texi
libavformat/http.c
See: a92fbe16f2
See: 636273d3d4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 03:18:12 +01:00
Michael Niedermayer
21d4c571fa
Merge commit '4ff99ab3d7d5576e99e6b8a411b4a44500ed88fa'
...
* commit '4ff99ab3d7d5576e99e6b8a411b4a44500ed88fa':
http: Refactor process_line
Conflicts:
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 02:52:17 +01:00
Michael Niedermayer
df41cbee85
Merge commit '7a2fddb4480121712df560cf619c1c3566cae3ff'
...
* commit '7a2fddb4480121712df560cf619c1c3566cae3ff':
http: K&R formatting cosmetics
Conflicts:
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 02:45:34 +01:00
Michael Niedermayer
b752d02f42
Merge commit '78b21c1d7177e1d61ad3c9225f67699da089aa7c'
...
* commit '78b21c1d7177e1d61ad3c9225f67699da089aa7c':
http: Drop doxy comments
Conflicts:
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 02:39:46 +01:00
Michael Niedermayer
03fd80dcb1
Merge commit '55a215ba63d9fa79cd7ee265ee2e777ee86b200c'
...
* commit '55a215ba63d9fa79cd7ee265ee2e777ee86b200c':
http: Return meaningful error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 02:34:02 +01:00
Michael Niedermayer
85e1368f57
Merge commit 'db9d39b4b5e5a3c20aeecf787ddeadd88f4906cf'
...
* commit 'db9d39b4b5e5a3c20aeecf787ddeadd88f4906cf':
avformat: Report the duration analysis reached
Conflicts:
libavformat/utils.c
See: 8529f9b36b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 02:11:47 +01:00
Michael Niedermayer
dbc3e1109c
avformat/flvdec: discard inconsistent timestamps
...
Fixes Ticket3425
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 01:50:41 +01:00
Clément Bœsch
2572d07c1f
http: Allow setting a Content-Type for POST requests
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-03-11 22:08:57 +01:00
Anssi Hannula
ab76d9f628
http: Always allow no-op seek
...
This also allows checking stream position as per ffurl_seek() doxy.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-03-11 22:08:57 +01:00
Anssi Hannula
2ec33d2712
http: Add support for selecting a request range
...
Comment from Reimar Döffinger included as pro memoria.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-03-11 22:08:57 +01:00
Clément Bœsch
ddfc989063
http: Support setting custom User-Agent
...
Contextually make the default User-Agent use the common
"Name/Version" pattern.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-03-11 22:08:57 +01:00
Michael Niedermayer
e58c85b068
http: Export Content-Type information
...
Bug-Id: https://bugs.debian.org/740421
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-03-11 22:08:57 +01:00
Luca Barbato
8075c3d8bb
http: Add support reading ICY metadata
...
Export the metadata as a icy_metadata_packet avoption.
Based on the work of wm4 and Alessandro Ghedini.
Bug-Id: https://bugs.debian.org/739936
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-03-11 22:08:57 +01:00
Alessandro Ghedini
fe568b3d27
http: Improve options descriptions
...
Add documentation where missing.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-03-11 22:08:57 +01:00
Luca Barbato
4ff99ab3d7
http: Refactor process_line
2014-03-11 22:08:56 +01:00
Luca Barbato
7a2fddb448
http: K&R formatting cosmetics
2014-03-11 22:08:56 +01:00
Luca Barbato
78b21c1d71
http: Drop doxy comments
2014-03-11 22:08:56 +01:00
Luca Barbato
55a215ba63
http: Return meaningful error codes
2014-03-11 22:08:56 +01:00
Luca Barbato
db9d39b4b5
avformat: Report the duration analysis reached
2014-03-11 21:55:11 +01:00
Michael Niedermayer
28ee7757f5
Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'
...
* commit 'd92024f18fa3d69937cb2575f3a8bf973df02430':
lavf: more correct printf format specifiers
Conflicts:
libavformat/asfdec.c
libavformat/cafdec.c
libavformat/dxa.c
libavformat/framecrcenc.c
libavformat/hnm.c
libavformat/iff.c
libavformat/mov.c
libavformat/mxfdec.c
libavformat/rmdec.c
libavformat/rpl.c
libavformat/smacker.c
libavformat/xmv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-11 21:05:34 +01:00
Carl Eugen Hoyos
54bbe3e2a6
Revert "Allow stream-copying grayscale mov files."
...
This reverts commit 691dec6201
.
The commit did not fix ticket #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
Diego Biurrun
d92024f18f
lavf: more correct printf format specifiers
2014-03-11 13:13:41 +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 '34bbc81de8a49fbddb92b76dc733f40890480b2b'
...
* commit '34bbc81de8a49fbddb92b76dc733f40890480b2b':
lavf: simplify ff_hevc_annexb2mp4_buf
Conflicts:
libavformat/hevc.c
libavformat/hevc.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-10 23:38:01 +01:00
Michael Niedermayer
b73cf4eb15
Merge commit 'ee17be3fdd37f63f4b77676820e387858908b0f4'
...
* commit 'ee17be3fdd37f63f4b77676820e387858908b0f4':
hevc: Use get_se_golomb_long
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-10 22:51:49 +01:00
Michael Niedermayer
77e9123fe5
lavf: always use av_free
...
Signed-off-by: Tim Walker <tdskywalker@gmail.com>
2014-03-10 18:02:55 +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 '8cafeb8bca5d079041739dbd72ccec0ead138eaf'
...
* commit '8cafeb8bca5d079041739dbd72ccec0ead138eaf':
mxfdec: Validate parameters to strftime
Conflicts:
libavformat/mxfdec.c
See: 423089e964
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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
.
Based on a patch by Hendrik Leppkes.
Signed-off-by: Martin Storsjö <martin@martin.st>
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 'a823d0948683bd97dd58556b5740e434166209a8'
...
* commit 'a823d0948683bd97dd58556b5740e434166209a8':
matroskaenc: write private data in hvcC format for HEVC.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 '4f3db5d3418a24f3b90422e98ad75388052c4284'
...
* commit '4f3db5d3418a24f3b90422e98ad75388052c4284':
movenc: allow muxing HEVC in MODE_MP4.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 'b6c61fb83e876d404ac3b0b3657ebfcafdcd1926'
...
* commit 'b6c61fb83e876d404ac3b0b3657ebfcafdcd1926':
movenc: enable Annex B to MP4 conversion for HEVC tracks.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 '20b40a597cdd4969cf1147d7c7efee2b6232524b'
...
* commit '20b40a597cdd4969cf1147d7c7efee2b6232524b':
movenc: write hvcC tag for HEVC.
Conflicts:
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-09 22:48:08 +01:00
Michael Niedermayer
ce1ad8d775
Merge commit '1d9014f0b008485eac4c19d5f5e11ede59237167'
...
* commit '1d9014f0b008485eac4c19d5f5e11ede59237167':
movenc: use 'hev1' tag for HEVC in MODE_MOV.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-09 22:31:55 +01:00
Michael Niedermayer
858d9947e4
Merge commit '8a0bc40545a216a49f43db5d9a42a63961333354'
...
* commit '8a0bc40545a216a49f43db5d9a42a63961333354':
libspeex: support ZygoAudio (quality 10 mode)
Conflicts:
libavformat/isom.c
See: e26b066cd8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 'eeae858596a5ce5a84797283f590a16add5704f4'
...
* commit 'eeae858596a5ce5a84797283f590a16add5704f4':
isom: Support Sony XAVC in mov
See: 5b9f39860d
See: 6e65e34837
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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