virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Code Issues Releases Activity
66,820 Commits 37 Branches 400 Tags 462 MiB
031285dedf
Commit Graph

15910 Commits

Author SHA1 Message Date
Michael Niedermayer
031285dedf Merge commit '72f801619a1ae91969fee9a7d72519422433c998' 
* commit '72f801619a1ae91969fee9a7d72519422433c998':
  movenc: Adjust edit lists to trim out parts of tracks with negative pts

Conflicts:
	libavformat/movenc.c

See: 66b45d8f7a
See: 14fd34d73b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-12 22:39:17 +02:00
Michael Niedermayer
5afe1233c5 Merge commit '8bef43388132b53f59a6e90add18900a3bb4cc60' 
* commit '8bef43388132b53f59a6e90add18900a3bb4cc60':
  smoothstreamingenc: Simplify code by removing a redundant variable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-12 22:29:47 +02:00
Michael Niedermayer
72f801619a movenc: Adjust edit lists to trim out parts of tracks with negative pts 
This makes sure that audio preroll for e.g. AAC is signaled correctly.

Previously we only wrote the edit list correctly if we had negative
dts but started with pts == 0 (e.g. for video with B-frames).

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-10-12 17:45:55 +03:00
Martin Storsjö
8bef433881 smoothstreamingenc: Simplify code by removing a redundant variable 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-10-12 17:42:42 +03:00
Michael Niedermayer
bd239c9a2e lavf: Don't drop both pts and dts if timestamps are invalid 
In these cases, only drop dts. Because if we drop both we have no
timestamps at all for some files.

This improves playback of HLS streams from GoPro cameras.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-10-12 01:32:52 +03:00
Michael Niedermayer
ae17a0c258 Merge commit '1d4579e38ecad578c86516fad2837a273d11b320' 
* commit '1d4579e38ecad578c86516fad2837a273d11b320':
  tcp: Add AVOption support

Conflicts:
	libavformat/tcp.c

See: 2e009c6042
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-11 00:39:01 +02:00
Clément Bœsch
937aac4f97 avformat/assenc: make sure we crawl extradata only if it's non-null 2014-10-10 23:49:38 +02:00
Michael Niedermayer
d246397161 Merge commit 'cd9d6399fd00f5aeacaa90cdc0b74c3570024119' 
* commit 'cd9d6399fd00f5aeacaa90cdc0b74c3570024119':
  tls: Support passing old-style tcp options

See: 4f4eb380f0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-10 22:28:49 +02:00
Michael Niedermayer
76d1ffffd0 Merge commit '3df8d52fcdc9036b4074fdc612d487ece8bb5b7f' 
* commit '3df8d52fcdc9036b4074fdc612d487ece8bb5b7f':
  rtsp: Add rtsps to the probe

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-10 21:36:27 +02:00
Michael Niedermayer
7028475f75 Merge commit 'c839b0439f0b01c72a6d253920d2e342b30f8bcb' 
* commit 'c839b0439f0b01c72a6d253920d2e342b30f8bcb':
  rtsp: Support tls when in listen mode

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-10 21:29:10 +02:00
Michael Niedermayer
c9791925a1 Merge commit '8b2e9636c57b22582143467a8a06b509b47b92f9' 
* commit '8b2e9636c57b22582143467a8a06b509b47b92f9':
  rtsp: Support tls-encapsulated RTSP

Conflicts:
	libavformat/rtsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-10 21:18:41 +02:00
Michael Niedermayer
544f811453 Merge commit 'c27328e749ff3be648411765cd17362fee017341' 
* commit 'c27328e749ff3be648411765cd17362fee017341':
  rtsp: Check for command strings without spaces

Conflicts:
	libavformat/rtspdec.c

See: a0568ed254
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-10 21:05:49 +02:00
Michael Niedermayer
cec7afd036 Merge commit '09e1ccc8cddc946da5e10841f10dc5ebdd187d9d' 
* commit '09e1ccc8cddc946da5e10841f10dc5ebdd187d9d':
  sctp: Use AVERROR_BUG instead of abort()

Conflicts:
	libavformat/sctp.c

See: 2e59142fa9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-10 20:51:52 +02:00
Michael Niedermayer
fc6aa30459 Merge commit 'eb4f9069002e73648f6640cd054fc814cfda75b8' 
* commit 'eb4f9069002e73648f6640cd054fc814cfda75b8':
  lavf: More informative error message

Conflicts:
	libavformat/mux.c

See: 30ced7e69f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-10 20:38:51 +02:00
Benoit Fouet
5e6fd132ff avformat/movenc: add EAC3 muxing support. 
Support only one independent substream right now, and only syncframes
containing 6 blocks.

Fixes part of ticket #3074

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-10 19:07:08 +02:00
Luca Barbato
1d4579e38e tcp: Add AVOption support 2014-10-10 16:29:07 +02:00
Luca Barbato
cd9d6399fd tls: Support passing old-style tcp options 
Make tcp and tls urls near-interchangeable.
 2014-10-10 16:29:07 +02:00
Luca Barbato
3df8d52fcd rtsp: Add rtsps to the probe 2014-10-10 16:29:06 +02:00
Luca Barbato
c839b0439f rtsp: Support tls when in listen mode 2014-10-10 16:29:06 +02:00
Luca Barbato
8b2e9636c5 rtsp: Support tls-encapsulated RTSP 2014-10-10 16:29:06 +02:00
Luca Barbato
c27328e749 rtsp: Check for command strings without spaces 
Prevent a NULL-pointer dereference.

CC: libav-stable@libav.org
 2014-10-10 16:29:06 +02:00
Luca Barbato
09e1ccc8cd sctp: Use AVERROR_BUG instead of abort() 
Trying to write to a stream id larger the the maximum requested is
a programming error, still there is no reason to leave a
reachable abort() in the codebase.

CC: libav-stable@libav.org
 2014-10-10 16:29:06 +02:00
Luca Barbato
eb4f906900 lavf: More informative error message 
Print the timestamp values and not just the stream index.
 2014-10-10 16:29:06 +02:00
Michael Niedermayer
e96fb980dc avformat/format: move mime_type_opt declaration to where its used 
also remove a related dead store

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-10 03:08:11 +02:00
Michael Niedermayer
27123a77c1 avformat/os_support: include unistd.h before defining lseek to lseek64 on android 
fixes build failure

Found-by: James Almer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-10 02:32:32 +02:00
Vignesh Venkatasubramanian
233f3ad869 lavf/webm_dash: Allow filenames without directories 
Fix basename computation code to allow just file names without any
directories in the path.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-10 00:46:37 +02:00
Frank Galligan
241b306b1e Fix writing first audio Cues in dash mode. 
In dahsmode Matroska is not writing the first Cluster for every
audio stream in the Cues element.

Signed-off-by: Frank Galligan <frankgalligan@gmail.com>
Reviewed-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-09 21:50:48 +02:00
Benoit Fouet
7cda31cb92 avformat/mov: E-AC-3 streams need parsing too. 
syncframes in E-AC-3 can be combined to provide 6 audio blocks per
sample, thus requiring parsing for proper decoding.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-09 15:38:09 +02:00
Yu Xiaolei
d5a6f11272 lavf: fix 2GB file seek limit on Android 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-09 13:08:33 +02:00
Michael Niedermayer
5d36e8527f avformat/mov: Fix 'warning: format specifies type unsigned short but the argument has type int' 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-09 05:49:25 +02:00
Michael Niedermayer
0578623039 avformat/dump: use format dump_separator if the codec one is not set 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-09 05:41:42 +02:00
Michael Niedermayer
cf7b90dea2 fix seperator typo 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-09 04:19:13 +02:00
Michael Niedermayer
349a32c436 Merge commit '0d8a3656ba4c0ae8e4e0c91ff6b07d72a317f9f6' 
* commit '0d8a3656ba4c0ae8e4e0c91ff6b07d72a317f9f6':
  mov: support the Color Parameter Atoms 'colr'

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-09 02:27:53 +02:00
Michael Niedermayer
04d8f616fd Merge commit '167e6f1489368a4693145da61cb022c113a285bc' 
* commit '167e6f1489368a4693145da61cb022c113a285bc':
  dump: Update streams and chapters printout format

See: cab2860c8a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-09 02:11:04 +02:00
Michael Niedermayer
f0a6874de8 avformat: Allow choosing the dump format field separator. 
The default is to maintain the previous ", " for now.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-09 00:56:58 +02:00
Michael Niedermayer
f22f873ef0 Merge commit '20a5956b8daeee4cb59d6fa00ec809b02c04d7f8' 
* commit '20a5956b8daeee4cb59d6fa00ec809b02c04d7f8':
  dump: split audio and video probing on multiple lines

Conflicts:
	libavcodec/utils.c
	libavformat/dump.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-09 00:56:23 +02:00
Michael Niedermayer
9da679e77f Merge commit '7ae9791b641d1183910b6e7faca23f7ae08f8579' 
* commit '7ae9791b641d1183910b6e7faca23f7ae08f8579':
  avformat: bump version after mime_type change

Conflicts:
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-08 21:45:41 +02:00
Michael Niedermayer
911ba8fb19 Merge commit 'b15b06ebf582ae81e47d236524c9ad6e10c8a0a7' 
* commit 'b15b06ebf582ae81e47d236524c9ad6e10c8a0a7':
  avformat: use const char* instead of uint8_t* for AVProbeData.mime_type

Conflicts:
	libavformat/format.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-08 21:35:40 +02:00
Michael Niedermayer
be695ee389 avformat/matroskadec: do not trust the default duration to be the real 1/timebase if its less than 5fps 
Fixes Ticket3980

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-08 20:39:37 +02:00
Vittorio Giovara
0d8a3656ba mov: support the Color Parameter Atoms 'colr' 2014-10-08 18:17:50 +01:00
Sylvain Rabot
167e6f1489 dump: Update streams and chapters printout format 
This matches the -map option which requires '%d:%d' format.
 2014-10-08 18:17:49 +01:00
Vittorio Giovara
20a5956b8d dump: split audio and video probing on multiple lines 
Also always report pixel format.
 2014-10-08 18:17:49 +01:00
Vittorio Giovara
7ae9791b64 avformat: bump version after mime_type change 2014-10-08 15:59:51 +01:00
Andreas Cadhalpun
b15b06ebf5 avformat: use const char* instead of uint8_t* for AVProbeData.mime_type 
This makes the field consistent with AVInputFormat.mime_type and the
argument type of av_match_name.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-10-08 15:13:15 +01:00
Michael Niedermayer
158b3fb584 avformat/tiertexseq: use av_freep(), do not leave stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-07 13:46:29 +02:00
Michael Niedermayer
0026c4ecfd avformat/hls: use av_freep(), do not leave stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-07 04:29:27 +02:00
Mark Reid
5c50214eed avformat/mxfdec: read reel_name and source timecode from physical source package 
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-07 03:13:06 +02:00
Michael Niedermayer
3726d07a2a Merge commit '28816050e47b6dba430a52e429d21a864cffda8e' 
* commit '28816050e47b6dba430a52e429d21a864cffda8e':
  lavf: Set the stream time base hint properly for chained muxers

Conflicts:
	libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-07 02:51:08 +02:00
Michael Niedermayer
4db0e8fd33 Merge commit 'b76249443864c88ffb2d41ab8d1de7432e985dc7' 
* commit 'b76249443864c88ffb2d41ab8d1de7432e985dc7':
  sdp: Simplify parsing/conversion of H264 extradata

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-07 02:40:02 +02:00
Martin Storsjö
28816050e4 lavf: Set the stream time base hint properly for chained muxers 
This avoids warnings about using the codec time base as time
base hint.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-10-06 23:30:52 +03:00