generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
64,953 Commits 24 Branches 241 Tags
ef21b3d38e61ba6730eb1d4573da65ca222b3619
Commit Graph

15450 Commits

Author SHA1 Message Date
Carl Eugen Hoyos
ef21b3d38e Ignore xing number of frames if the file is larger than indicated. 
Fixes ticket #3777.
 2014-07-24 15:34:36 +02:00
Michael Niedermayer
8b59ab1af0 Merge commit 'ce2e858f5b3416c2d54f7f8c14e901f75c48b785' 
* commit 'ce2e858f5b3416c2d54f7f8c14e901f75c48b785':
  http: K&R formatting cosmetics

Conflicts:
	libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-24 02:08:14 +02:00
Diego Biurrun
ce2e858f5b http: K&R formatting cosmetics 
Also comment some #endifs and reshuffle headers into canonical order.
 2014-07-23 13:57:24 -07:00
Andrey Utkin
8a4c0866dc avio: Introduce avio_read_to_bprint(avioctx, bp, max_size) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-23 18:42:41 +02:00
Michael Niedermayer
01b236b704 avformat/flvdec: use AV_PKT_DATA_NEW_EXTRADATA for h264 too 
Fixes Ticket 3787

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-23 17:41:12 +02:00
Michael Niedermayer
016cca4504 Merge commit '7bdd2ff6825951f7a6a6008303acfce7c2a63532' 
* commit '7bdd2ff6825951f7a6a6008303acfce7c2a63532':
  http: Use a constant for the supported header size

Conflicts:
	libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-22 22:02:48 +02:00
Carl Eugen Hoyos
050d79b6dd Autodetect big-endian tiff files. 2014-07-22 18:09:14 +02:00
Luca Barbato
7bdd2ff682 http: Use a constant for the supported header size 2014-07-22 16:38:26 +02:00
Stefano Sabatini
44071b0d25 lavf/segment: sanitize segment end time in case last packet do not have a defined duration 
In particular, avoids to set segments with duration set to 0
(e.g. segment with a single reference frame for which duration is
undefined).
 2014-07-22 13:53:31 +02:00
Stefano Sabatini
713157484a lavf/segment: do not allow to create segments with no key-frames 
Fix trac ticket #3749.
 2014-07-22 13:43:06 +02:00
Andreas Cadhalpun
135ea609ce libavformat/img2dec.c: Add a long_name to the piped image demuxers 
This fixes segfaults in gst-libav1.0 compiled against FFmpeg 2.3.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-22 05:14:44 +02:00
Michael Niedermayer
ab7c67905d Merge commit '389380c27915b0505fed538cd54c035c891fabd9' 
* commit '389380c27915b0505fed538cd54c035c891fabd9':
  http: Do move the class instantiation in the conditional block

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-22 03:00:06 +02:00
Michael Niedermayer
e621e6cac6 Merge commit '28df1d24112c6ad0763985df2faeeb198cfbad69' 
* commit '28df1d24112c6ad0763985df2faeeb198cfbad69':
  http: Provide an option to override the HTTP method

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-22 02:51:35 +02:00
Michael Niedermayer
c7168d1a22 Merge commit 'fc27e7272e6f1a7053812f8a15b1b7098de44c71' 
* commit 'fc27e7272e6f1a7053812f8a15b1b7098de44c71':
  mpegts: do not export empty language tags

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-22 02:34:12 +02:00
Dale Curtis
70f7006eb3 avformat/mov: Pass through iTunSMPB from MOV. 
Allows demuxing of iTunes files into adts while preserving gapless
metadata.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-22 02:11:48 +02:00
Dale Curtis
42f3bc4072 avformat/adtsenc: Optionally enable ID3 in ADTS. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-22 02:11:25 +02:00
Luca Barbato
389380c279 http: Do move the class instantiation in the conditional block 
Remove a warning if https support is disabled.
 2014-07-21 22:18:35 +02:00
Luca Barbato
28df1d2411 http: Provide an option to override the HTTP method 
Certain servers accept only PUT as valid method.
 2014-07-21 22:18:35 +02:00
Jan Gerber
fc27e7272e mpegts: do not export empty language tags 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-07-21 19:39:31 +00:00
Michael Niedermayer
71e515c180 avformat/sapenc: Use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-21 03:19:12 +02:00
Jan Gerber
73b7a360d8 matroskaenc: Don't set language to empty string, use "und" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-20 14:03:00 +02:00
Michael Niedermayer
cb169126c5 avformat/dvenc: Implement 32khz & 44.1khz for 25/50fps 
30000/1001 fps isnt implemented as i dont know which are the correct interleaving parameters,
pointers to the appropriate spec and page are welcome

Fixes Ticket2597

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-19 20:48:22 +02:00
Michael Niedermayer
a7bb22c5aa avformat/seek: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-19 19:44:56 +02:00
Carl Eugen Hoyos
ee88a2080e Parse dri when receiving jpg via rtp. 
Based on a patch by contact at iridiummobile ru.
Fixes ticket #3780.
 2014-07-18 23:11:11 +02:00
Carl Eugen Hoyos
0e70266bbf Write valid free atom when -moov_size is specified. 
Fixes ticket #3769.
 2014-07-18 23:11:11 +02:00
Stefano Sabatini
526bd7bdfa lavf/segment: set segment end time when the first packet arrives 
Avoid negative durations in case there is a single packet in the current
segment, since in that case the end time is still set to the previous
segment end time.
 2014-07-17 16:51:51 +02:00
Stefano Sabatini
3d38c99041 lavf/segment: fix weird indent 2014-07-17 16:51:51 +02:00
Stefano Sabatini
b6a8c5245f lavf/segment: show incoming packet duration in debug message 2014-07-17 16:51:51 +02:00
Stefano Sabatini
5acad50056 lavf/segment: only use reference frames for computing the segment end time 
This avoids a systematic overestimate of the segments duration when there
are several streams.

Fix trac ticket #3724.
 2014-07-17 16:51:50 +02:00
Michael Niedermayer
88f038ac97 avformat/dv: implement fallback in dv_extract_pack() 
Fixes Ticket2340
Fixes Ticket2341

Based-on mail from Dave Rice <dave@dericed.com>
Tested-by: Dave Rice <dave@dericed.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-17 15:29:27 +02:00
Michael Niedermayer
e5cb7795fc Merge commit '324ff59444ff5470bb325ff1e2be7c4b054fc944' 
* commit '324ff59444ff5470bb325ff1e2be7c4b054fc944':
  avpacket: Check for and return errors in ff_interleave_add_packet()

Conflicts:
	libavformat/audiointerleave.c
	libavformat/internal.h
	libavformat/mux.c

See: 4d7c71c364
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-17 14:20:10 +02:00
Nidhi Makhijani
324ff59444 avpacket: Check for and return errors in ff_interleave_add_packet() 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-07-17 03:18:46 -07:00
Simon Thelen
fa6716c66d libavformat/segment: change segment_list_size behavior to match hls_list_size behavior. 
Make the segment muxer keep segment_list_size segments instead of
segment_list_size + 1 segments. This patch also changes the
documentation for segment_list_size to reduce possible confusion over
how many segments are kept.

this allows the segment list to
be limited to containing only one segment which used to be impossible
because a segment_list_size of 0 kept all the segments and a
segment_list_size of 1 kept 2 segments.

Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-17 02:35:56 +02:00
Michael Niedermayer
37a0ac1d82 avformat: Micro bump for "md5enc: add format_version, to allow selecting which version to use" 
Suggested-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-16 22:58:29 +02:00
Michael Niedermayer
7da2592f56 avformat/md5enc: add format_version, to allow selecting which version to use 
Currently there is just version 1
Fixes remaining part of Ticket2280

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-16 22:50:24 +02:00
Michael Niedermayer
e240d01c12 avformat/matroskadec: fix declaration after statement 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-16 00:06:15 +02:00
Vignesh Venkatasubramanian
3e73d14290 lavf: Add WebM DASH Manifest Muxer 
This patch adds the ability to generate WebM DASH manifest XML using
ffmpeg. A sample command line would be as follows:

ffmpeg \
  -f webm_dash_manifest -i video1.webm \
  -f webm_dash_manifest -i video2.webm \
  -f webm_dash_manifest -i audio1.webm \
  -f webm_dash_manifest -i audio2.webm \
  -map 0 -map 1 -map 2 -map 3 \
  -c copy \
  -f webm_dash_manifest \
  -adaptation_sets “id=0,streams=0,1 id=1,streams=2,3” \
  manifest.xml

It works by exporting necessary fields as metadata tags in matroskadec
and use those values to write the appropriate XML fields as per the WebM
DASH Specification [1]. Some ideas are adopted from webm-tools project
[2].

[1]
https://sites.google.com/a/webmproject.org/wiki/adaptive-streaming/webm-dash-specification
[2]
https://chromium.googlesource.com/webm/webm-tools/+/master/webm_dash_manifest/

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-15 23:58:36 +02:00
Vignesh Venkatasubramanian
5a20656946 lavf/matroska: Add functions for WebM DASH Manifest 
Add functions and logic to matroskadec for use by the WebM DASH Manifest
XML Muxer. The actual muxer is added in a future patch.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-15 23:56:17 +02:00
Michael Niedermayer
62227a70f0 avformat: add av_stream_get_parser() to access avformat AVParser 
The AVStream.parser field is considered private and its location cannot be
preserved while preserving also ABI compatibility to libav, as libav added fields
before it.
Some tools like ffmpeg.c access this field though

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-14 21:17:20 +02:00
Michael Niedermayer
6821572499 avformat/movenc: dont mark multichannel as mono tracks as containing the center channel 
Fixes Ticket3727

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-14 17:11:11 +02:00
Michael Niedermayer
47c84c0bf7 avformat/wavdec: add basic sanity check for the sample count 
Fixes Ticket3708

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-14 14:52:18 +02:00
Michael Niedermayer
2db1bcf1b9 avformat/asfdec: Try to improve skip case 
Fixes Ticket3761

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-14 01:16:08 +02:00
Lukasz Marek
4cc0f79a2c lavf: add samba protocol via libsmbclient 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-13 20:38:55 +02:00
Star Brilliant
3f815f713b AVFormat: LRC demuxer and muxer 
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-13 19:18:31 +02:00
Michael Niedermayer
4eb13cdfb0 avformat/asfdec: dvrms timestamps are pts not dts 
Should fix Ticket3328

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-13 03:50:47 +02:00
Michael Niedermayer
8202c49b43 avformat/utils: do not wait for packets from discarded streams for genpts 
Fixes long loop
Fixes Ticket3208

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-13 01:07:59 +02:00
Michael Niedermayer
4470a3eeaf avformat/mpegts: dont clear programs during probing 
Fixes Ticket 3763

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 21:49:15 +02:00
Lukasz Marek
ca671beead lavf/libssh: set freed pointers to NULL 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 03:01:38 +02:00
Paul B Mahol
6779bf3f0f avformat/wavenc: use av_mallocz_array() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-07-11 10:38:45 +00:00
Michael Niedermayer
c6c172d173 avformat/mpegts: skip updating programs/streams when determining duration 
Fixes Ticket2441

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-11 16:43:27 +02:00