generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
66,111 Commits 24 Branches 241 Tags 173 MiB
53b0892005
Commit Graph

15726 Commits

Author SHA1 Message Date
Michael Niedermayer
ddc6adaa28 Merge commit '4d55e9de27894ddfb337b28cd7aa6d14a12666d2' 
* commit '4d55e9de27894ddfb337b28cd7aa6d14a12666d2':
  vc1: Split bits used in libavformat into a separate header

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-04 20:09:01 +02:00
Diego Biurrun
4d55e9de27 vc1: Split bits used in libavformat into a separate header 
This reduces inter-library dependencies.
 2014-09-04 07:11:03 -07:00
Steven Liu
03efd73082 avformat/flvdec: read the correct bits into the tag type 
from the flv spec, the flvtag define the tagtype as one byte,
the spec desc is:
Reserved  UB[2] Reserved for FMS, should be 0
Filter    UB[1] Indicates if packets are filtered.
                0 = No pre-processing required.
                1 = Pre-processing (such as decryption) of the packet is
                    required before it can be rendered.
                    Shall be 0 in unencrypted files, and 1 for encrypted
tags.
                    See Annex F. FLV Encryption for the use of filters.
TagType   UB[5] Type of contents in this tag. The following types are
                defined:
                        8 = audio
                        9 = video
                        18 = script data

Signed-off-by: Steven Liu <qi.liu@chinacache.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-04 14:54:23 +02:00
Michael Niedermayer
4bc4f6f170 Merge commit '95e177eeb21f3e968aa9353bc69d1946966cc835' 
* commit '95e177eeb21f3e968aa9353bc69d1946966cc835':
  rtpdec: HEVC/H.265 support

Conflicts:
	Changelog
	libavformat/rtpdec_hevc.c
	libavformat/version.h

See: 96b2ba68c4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-03 14:56:53 +02:00
Michael Niedermayer
e489e83466 avformat/mpegts: Change order of structs to match 7968059e5c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-03 12:54:41 +02:00
Michael Niedermayer
ee83f667af Merge commit '7968059e5c3cd8f91407f379c11bbf71a1b84c74' 
* commit '7968059e5c3cd8f91407f379c11bbf71a1b84c74':
  mpegts: Allow custom max resync size

Conflicts:
	libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-03 12:44:14 +02:00
Thomas Volkert
95e177eeb2 rtpdec: HEVC/H.265 support 
As specified in draft-ietf-payload-rtp-h265-06.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-09-03 02:39:24 +02:00
Luca Barbato
7968059e5c mpegts: Allow custom max resync size 2014-09-03 02:38:03 +02:00
Michael Niedermayer
1c55d0ff32 avformat/swfdec: Use side data to communicate w/h changes to the decoder 
Fixes reading from freed data
Fixes part of Ticket3539

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-02 13:37:07 +02:00
Mika Raento
502fc3b3d4 segment: fix copying stream metadata 
To get mpegts metadata copied when segmenting.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-02 12:31:04 +02:00
Mika Raento
413fa76f61 segment: use mpegts_flags instead of the deprecated resend_headers option 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-02 12:31:04 +02:00
Michael Niedermayer
0ffe32cf8f avformat/segment: Use avformat_alloc_output_context2() 
This avoids having to assign oformat, allows returning the
correct error code and allocates priv_data

Based on patch by: Mika Raento <mika.raento@elisa.fi>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-02 12:31:04 +02:00
Carl Eugen Hoyos
3668168afa Support decoding of ImageJ png in avi. 
Fixes ticket #3916.
 2014-09-02 12:02:03 +02:00
Mika Raento
58e0402e02 segment: don't access outside seg->frames array 
Fixes wrong number of segments output and undefined memory access.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-02 11:38:36 +02:00
Michael Niedermayer
4250753497 avformat/mpegts: favor DESC_types over probed codecs 
Fixes Ticket3766
Fixes dvb_teletext detection

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-01 03:22:34 +02:00
Paul B Mahol
bd6f145820 avformat/dfa: use avio_feof() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-08-30 15:50:22 +00:00
wm4
b173f5c155 oggdec: fix invalid free on error 
The read_packet callback passes a pointer to a stack-allocated AVPacket.
Attempting to free it with av_free() makes no sense.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-30 16:38:14 +02:00
Michael Niedermayer
ce36d80881 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  lavf/rtpdec_hevc: Fix compilation with -DDEBUG.
  ffmpeg: Clean up if filter initialisation failed to avoid a memleak.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-30 14:38:44 +02:00
Carl Eugen Hoyos
f22c24bd7a lavf/rtpdec_hevc: Fix compilation with -DDEBUG. 2014-08-30 13:01:51 +02:00
Michael Niedermayer
97cebf3139 avformat/udp: Move variables used only with HAVE_PTHREAD_CANCEL, under the #if 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-30 12:43:58 +02:00
Michael Niedermayer
19bf1ed1f4 avformat/id3v2: Fix "warning: unused variable uncompressed_buffer_size" if zlib is unavailable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-30 12:21:07 +02:00
Reimar Döffinger
d9e2aceb7f Add missing "const" all over the place. 
Only "./configure --enable-gpl" on x86 was tested.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-29 18:57:25 +02:00
Peter Ross
9b8eedd736 avformat/wtvdec: seek over broken chunks 
Fixes ticket #3898

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-29 14:00:58 +02:00
Michael Niedermayer
72732f2ddd avformat/webmdashenc: use av_strlcpy() and allocate enough space 
Fixes out of array read

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-29 13:02:34 +02:00
Michael Niedermayer
37520a91ac avformat: drop redundant MATROSKA_VIDEO_STEREO_MODE_COUNT identifier 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-29 01:26:52 +02:00
Michael Niedermayer
39cd9fdbf8 Merge commit '4d686fb721b485ebbc4c7779d927d876c1e630f7' 
* commit '4d686fb721b485ebbc4c7779d927d876c1e630f7':
  matroskaenc: convert avstream stereo3d side data during encoding

Conflicts:
	libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-29 00:44:47 +02:00
Michael Niedermayer
fcc3909908 Merge commit 'd4ae8ac92f619507aadd021bb67b517d39d3a36f' 
* commit 'd4ae8ac92f619507aadd021bb67b517d39d3a36f':
  matroskadec: parse stereo mode on decoding

Conflicts:
	Changelog
	libavformat/matroska.c
	libavformat/matroskadec.c

See: 4c509fe305 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-28 23:48:23 +02:00
Michael Niedermayer
f30a8154ab Merge commit '9301486408a480629336af4d7fd873c0f28fb2d5' 
* commit '9301486408a480629336af4d7fd873c0f28fb2d5':
  avcodec: add stream-level stereo3d side data

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/utils.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-28 22:23:01 +02:00
Michael Niedermayer
56cc754c76 Merge commit 'f2583bc86eb5d7decc639fc9a36edc93e6003eef' 
* commit 'f2583bc86eb5d7decc639fc9a36edc93e6003eef':
  matroska: list supported extensions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-28 22:12:36 +02:00
Vittorio Giovara
4d686fb721 matroskaenc: convert avstream stereo3d side data during encoding 
Write the StereoMode Embl to bitstream.
 2014-08-28 12:35:27 -04:00
Vittorio Giovara
d4ae8ac92f matroskadec: parse stereo mode on decoding 
Convert the Matroska stereo format to the Stereo3D format, and add a
Stereo3D side data to the stream.

Bump the doctype version supported.

Bug-Id: 728 / https://bugs.debian.org/757185
 2014-08-28 12:33:26 -04:00
Vittorio Giovara
9301486408 avcodec: add stream-level stereo3d side data 2014-08-28 12:33:26 -04:00
Vittorio Giovara
f2583bc86e matroska: list supported extensions 2014-08-28 12:33:25 -04:00
Paul B Mahol
0ddb0516f1 avformat/soxenc: return more meaningful error code 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-08-28 15:52:25 +00:00
Michael Niedermayer
d6bd29492c avformat/icoenc: Remove deprecated use of codec_name 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-28 14:34:55 +02:00
Michael Niedermayer
e6516944a3 avformat/rtpdec_asf: fix compiler warning about const qualifier being discarded 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-27 23:53:53 +02:00
Michael Niedermayer
35debfc366 avformat/rdt: fix compiler warning about const qualifier being discarded 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-27 23:52:40 +02:00
Michael Niedermayer
7a2c380e93 avformat/aviobuf: remove uses of deprecated url_feof() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-27 22:30:07 +02:00
James Almer
d3e9bee6f7 lavf/mp3enc: don't abort if audio packets can't be buffered 
Instead skip the picture streams and flush the queued audio packets.
Should address ticket #3851.

Signed-off-by: James Almer <jamrial@gmail.com>
 2014-08-27 13:51:34 -03:00
Anton Khirnov
75bbaf2493 mpegenc: limit the maximum muxrate 
It is written to the file as a 22-bit value.

CC: libav-stable@libav.org
 2014-08-27 06:21:54 +00:00
Michael Niedermayer
9e8ab36f54 avformat/mxfenc: dont warn about d10_channelcount being ignored if its not set 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-27 02:13:50 +02:00
Michael Niedermayer
7206221d56 Merge commit '4c8bd8ddb049950347a5018fecbca7ee25d48c44' 
* commit '4c8bd8ddb049950347a5018fecbca7ee25d48c44':
  os_support: Adjust an outdated #endif comment

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-26 20:40:40 +02:00
ThomasVolkert
e15824e75b avformat/rtpdec_h261: Fix sanity checks 
Fixes mbap and quant

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-26 20:37:58 +02:00
Diego Biurrun
4c8bd8ddb0 os_support: Adjust an outdated #endif comment 2014-08-26 06:34:41 -07:00
Michael Niedermayer
46ad2c4aed avformat/utils: remove assert that tests the same condition as the if() directly above 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-26 15:23:23 +02:00
Michael Niedermayer
bf16872fec avformat/nsvdec: fix out-commented asserts so the function names exist 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-26 15:21:25 +02:00
Michael Niedermayer
cf0e8e7ad4 Merge commit '4e9e6fa99f3ff83cedbf6c378d62065ae419a3b9' 
* commit '4e9e6fa99f3ff83cedbf6c378d62065ae419a3b9':
  mpeg: Write H264 streams at offset 2

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-26 14:05:07 +02:00
Luca Barbato
4e9e6fa99f mpeg: Write H264 streams at offset 2 
It hints that the content is H264 according to HD-DVD.
 2014-08-26 03:43:13 +02:00
ThomasVolkert
96b2ba68c4 avformat/rtpdec: support for HEVC/H.265 RTP payload format (draft v6) depacketizing 2014-08-26 02:18:08 +02:00
Alexander Strasser
db85d11d9d libavformat/ftp: Do not leak memory in routine ftp_features 
Setting the pointer to NULL inside both ftp_send_command
and ftp_features is redundant. Generally always setting to
NULL in ftp_send_command seems safer, but throughout the file
that parameter was always passed initialized. So I do it here
too for consistency.

Should fix CID1231988 (RESOURCE_LEAK)

OKed-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
 2014-08-26 00:52:29 +02:00