Michael Niedermayer
5f9b1aae50
Merge commit ' 6454c44f9f'
...
* commit '6454c44f9f
2013-08-29 13:43:07 +02:00
Lukasz Marek
f3ace37a3b
lavf/ftp: fix possible crash
2013-08-29 01:57:38 +02:00
Michael Niedermayer
c4810fbe4f
avformat/utils: fix av_probe_input_buffer2() so it returns the probe score
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-29 01:15:15 +02:00
Michael Niedermayer
e31db621bf
avformat: export probe score
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-28 22:18:57 +02:00
Martin Storsjö
6454c44f9f
rtmpproto: Fix limelight authentication with abbreviated app names
...
When streaming to limelight, the app name is either a full
"appname/subaccount" or "appname/_definst_". In the latter case,
the app name can be simplified into simply "appname", but the
authentication hashing assumes the /_definst_ still to be present.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-08-28 17:54:51 +03:00
Michael Niedermayer
72196a4b8d
Merge commit ' 310cc4bf82'
...
* commit '310cc4bf82
2013-08-28 12:34:33 +02:00
Michael Niedermayer
946902e5b9
Merge commit ' f4634ae8a8'
...
* commit 'f4634ae8a8
2013-08-28 12:03:06 +02:00
Michael Niedermayer
87d38ad803
Merge commit ' f812eeda17'
...
* commit 'f812eeda17
2013-08-28 11:33:59 +02:00
Martin Storsjö
310cc4bf82
smoothstreamingenc: Write to a temp file while updating the manifest
...
If a client tries to read the file while it's being updated, the client
would get an incomplete manifest. Instead write to a separate temp file
and atomically rename it to replace the previous one.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-08-27 19:44:31 +03:00
Luca Barbato
f4634ae8a8
flv: Fix the help string
2013-08-27 14:38:54 +02:00
John Stebbins
f812eeda17
matroskaenc: Fix writing TRACKDEFAULTFLAG
...
The element was only being written when the value == 1. But the default
value of this element is 1, so this has no useful effect. This element
needs to be written when the value == 0.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-27 14:00:31 +02:00
Michael Niedermayer
231201382e
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
movenc: Check for errors from mov_create_chapter_track
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-27 12:52:17 +02:00
Michael Niedermayer
da2038221b
Merge commit ' 2bbad1f94c'
...
* commit '2bbad1f94c
2013-08-27 12:47:04 +02:00
Michael Niedermayer
ef4fcb30c4
Merge commit ' 3559fb97c4'
...
* commit '3559fb97c4
2013-08-27 12:33:39 +02:00
Michael Niedermayer
0bd15938ec
Merge commit ' 4d122b01e4'
...
* commit '4d122b01e4
2013-08-27 12:26:27 +02:00
Martin Storsjö
0fb3e1c6ce
movenc: Check for errors from mov_create_chapter_track
...
On failures in the write_trailer function, we could also ignore
the errors and try to finish the file despite these errors (which
would only leave an incomplete chapters track). It's probably better
to signal the error clearly to the caller though (and if this
function failed there's no guarantee that there's enough memory to
finish the trailer either).
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-08-27 10:26:10 +03:00
Martin Storsjö
2bbad1f94c
movenc: Properly free allocated data on failures in mov_write_header
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-08-27 10:26:08 +03:00
Martin Storsjö
3559fb97c4
movenc: Check that tracks->enc exists before trying to free extradata
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-08-27 10:26:07 +03:00
Martin Storsjö
4d122b01e4
movenc: Check for allocation failures in mov_create_chapter_track
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-08-27 10:25:55 +03:00
Michael Niedermayer
535d9a9386
avformat/ftp: make const tables static const
...
Reviewed-by: Lukasz M <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-27 03:55:45 +02:00
Michael Niedermayer
e43c672b56
Merge commit ' b89e8759e0'
...
* commit 'b89e8759e0
2013-08-26 14:36:00 +02:00
Michael Niedermayer
d3ff77023e
Merge commit ' 5b41eb91e0'
...
* commit '5b41eb91e0
2013-08-26 14:26:40 +02:00
Michael Niedermayer
b32a6da100
Merge commit ' 0b5af5cf12'
...
* commit '0b5af5cf12
2013-08-26 13:59:28 +02:00
Michael Niedermayer
e299aa78d9
Merge commit ' 08504380dd'
...
* commit '08504380dd
2013-08-26 13:28:04 +02:00
Michael Niedermayer
80e0599402
Merge commit ' dc518a3ae2'
...
* commit 'dc518a3ae2
2013-08-26 13:18:43 +02:00
Michael Niedermayer
9748f1477d
Merge commit ' ef196beeb5'
...
* commit 'ef196beeb5
2013-08-26 13:14:09 +02:00
Michael Niedermayer
bc6370b622
Merge commit ' a3b53ff062'
...
* commit 'a3b53ff062
2013-08-26 13:07:13 +02:00
Michael Niedermayer
f5a0c205d9
Merge commit ' bf98562505'
...
* commit 'bf98562505
2013-08-26 12:44:29 +02:00
Michael Niedermayer
8d679bc7e6
avformat/mp3dec: improve detection of mp3s with huge id3 tags
...
When a id3 tag is larger than the amount of space we will probe
give it a score similar to what a .mp3 extension would have given it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-26 00:57:35 +02:00
Michael Niedermayer
a9d1a7c79b
avformat: move PROBE_BUF_M* to internal.h
...
They will be used by the mp3 probe function in the next commit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-26 00:54:30 +02:00
Michael Niedermayer
22fbc7f8be
avformat/tcp: fix pointer to int warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-25 19:44:40 +02:00
Luca Barbato
b89e8759e0
mov: Write tmcd extradata
2013-08-25 13:49:21 +02:00
Luca Barbato
5b41eb91e0
mov: Parse tmcd extradata
2013-08-25 13:49:13 +02:00
Michael Niedermayer
88909beca3
avcodec/movenc: move chapter_properties under the #if of the code that uses it
...
Fixes warning about unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-24 23:23:00 +02:00
Luca Barbato
0b5af5cf12
mov: Refactor multiple stsd skipping in mov_mov_skip_multiple_stsd
2013-08-24 17:02:23 +02:00
Luca Barbato
08504380dd
mov: Refactor codec specific final steps in mov_finalize_stsd_codec
2013-08-24 17:02:23 +02:00
Luca Barbato
dc518a3ae2
mov: Refactor subtitle specific parsing in mov_parse_stsd_subtitle
2013-08-24 17:02:23 +02:00
Luca Barbato
ef196beeb5
mov: Refactor audio specific parsing in mov_parse_stsd_audio
2013-08-24 17:02:23 +02:00
Luca Barbato
a3b53ff062
mov: Refactor video specific parsing in mov_parse_stsd_video
2013-08-24 17:02:23 +02:00
Luca Barbato
bf98562505
mov: Refactor codec id selection in mov_codec_id
2013-08-24 17:02:23 +02:00
Michael Niedermayer
aadfadd784
avformat/redspark: check coef_off
...
Fixes out of array reads
Found-by: Laurent Butti <laurentb@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-23 20:05:35 +02:00
Michael Niedermayer
800ea20cad
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
movenc: Make tkhd "enabled" flag QuickTime compatible
Conflicts:
libavformat/movenc.c
tests/ref/acodec/alac
tests/ref/acodec/pcm-s16be
tests/ref/acodec/pcm-s24be
tests/ref/acodec/pcm-s32be
tests/ref/acodec/pcm-s8
tests/ref/lavf/mov
tests/ref/vsynth/vsynth1-dnxhd-1080i
tests/ref/vsynth/vsynth1-mpeg4
tests/ref/vsynth/vsynth1-prores
tests/ref/vsynth/vsynth1-qtrle
tests/ref/vsynth/vsynth1-svq1
tests/ref/vsynth/vsynth2-dnxhd-1080i
tests/ref/vsynth/vsynth2-mpeg4
tests/ref/vsynth/vsynth2-prores
tests/ref/vsynth/vsynth2-qtrle
tests/ref/vsynth/vsynth2-svq1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-23 13:49:24 +02:00
Michael Niedermayer
c6f4a3a708
Merge commit ' 1f70a5ad28'
...
* commit '1f70a5ad28
2013-08-23 13:27:34 +02:00
Stefano Sabatini
0be3be9011
lavf/tee: copy metadata to output chained muxers
2013-08-23 12:27:09 +02:00
John Stebbins
30ce289074
movenc: Make tkhd "enabled" flag QuickTime compatible
...
QuickTime will play multiple audio tracks concurrently if this flag is
set for multiple audio tracks. And if no subtitle track has this flag
set, QuickTime will show no subtitles in the subtitle menu.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-23 09:55:42 +02:00
John Stebbins
1f70a5ad28
mov: use tkhd enabled flag to set the default track
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-23 09:24:22 +02:00
Michael Niedermayer
c443689afb
avformat/movenc: use av_freep() instead of av_free() except for local variables before return
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-23 00:31:15 +02:00
Stefano Sabatini
7af7b45c38
lavf/image2: extend start_number range to accept zero
...
Address trac ticket #2884 .
2013-08-22 14:26:23 +02:00
Michael Niedermayer
25e4ec6aa1
Merge commit ' 60198742ff'
...
* commit '60198742ff
2013-08-22 14:16:52 +02:00
Michael Niedermayer
606a30c5a1
Merge commit ' fe5d5a8ffc'
...
* commit 'fe5d5a8ffc
2013-08-22 13:58:23 +02:00
