ffmpeg

Author	SHA1	Message	Date
Nicolas George	c27939d871	lavf/concatdec: check match_streams() return value.	2014-04-29 13:25:59 +02:00
Nicolas George	e973cf04f6	lavf/concatdec: use a structure for each stream.	2014-04-29 13:25:59 +02:00
Nicolas George	c9212abf95	lavf/matroska: add "binary" pseudo-MIME type. Avoid long scan and "Could not find codec parameters for stream" error when an attachment has this type.	2014-04-29 13:25:59 +02:00
Luca Barbato	5a70a783f0	hls: Add an option to prepend a baseurl to the playlist entries Useful to generate playlists with absolute paths. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>	2014-04-29 12:14:11 +02:00
Enrique Arizón Benito	5c08ae4f37	segment: Add an option to prepend a string to the list entries Useful to generate lists with absolute urls. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>	2014-04-29 12:14:00 +02:00
Michael Niedermayer	a215b15815	avformat/utils: Set the average frame rate from the r_frame_rate if the stream appears to be cfr This permits the average fps to be set in more cases Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-28 18:51:15 +02:00
Michael Niedermayer	34e7d3c368	avformat/utils: Ensure that average fps is probed if requested by the user even if tb_unreliable() is 0 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-28 16:30:50 +02:00
Michael Niedermayer	1f249d2ca7	avformat/utils: prevent r frame rate from being set larger than 1/tb Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-28 15:49:51 +02:00
Michael Niedermayer	4394f82f52	avformat/utils: add gif to tb_unreliable() This improves the used timebases when gif is the source Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-28 15:20:38 +02:00
Anton Khirnov	1eb57e1d9b	lavc: eliminate tb_unreliable() If framerate estimation is enabled, it makes sense to always apply it, instead of limiting it to a few specific cases.	2014-04-28 11:34:59 +02:00
Peter Ross	b3c0d010c3	avformat/mlvdec: close any additional .Mxx files Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-27 15:34:27 +02:00
Peter Ross	8bd6837e51	avformat/mlvdec: remove unused MlvContext.buffer Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-27 15:34:22 +02:00
Michael Niedermayer	466988ab75	Fix dont and doesnt typos Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-27 15:14:32 +02:00
Michael Niedermayer	e2a5557cbb	Merge remote-tracking branch 'cehoyos/master' * cehoyos/master: lavf/mpeg.h: Remove an unused definition. Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-27 15:04:00 +02:00
Carl Eugen Hoyos	4abbea0243	lavf/mpeg.h: Remove an unused definition. Fixes a warning when compiling mpegts.c.	2014-04-27 14:54:29 +02:00
Michael Niedermayer	e9ad121ba5	Fix skiping typos Found-by: Alessandro Ghedini <alessandro@ghedini.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-27 14:50:14 +02:00
Peter Ross	9abf08f79f	avformat/mlvdec: print unsigned chunk size Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-27 14:37:54 +02:00
Peter Ross	bdab0c2d76	avformat/mlvdec: process ff_get_wav_header return value Fixes CID1206640. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-27 14:37:18 +02:00
goodthanks	c9cfd45838	avformat/mpegtsenc: Allow DTS audio copy to TS streams This doesn't allow encoding of DTS or TrueHD. It just sets the correct stream ID in the TS output file when a DTS or TrueHD audio stream is copied. Fixes ticket #1398 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-27 14:24:29 +02:00
Carl Eugen Hoyos	ade5851be0	Try mov tags if the fourcc in V_MS/VFW mkv files cannot be found in bmp tags. Fixes decoding of broken mkv files containing ProRes video from ticket #3434.	2014-04-27 12:52:34 +02:00
Michael Niedermayer	66e30a2e65	avformat/mpegtsenc: check avformat_new_stream() return Fixes CID1206645 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-26 22:08:37 +02:00
Michael Niedermayer	24725f8e09	avformat/matroskaenc: fix indention level Fixes CID1206644 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-26 22:01:48 +02:00
Michael Niedermayer	9b1d7d4fd3	avformat/oggparsecelt: fix memleak Fixes: CID1108605 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-26 21:31:15 +02:00
Michael Niedermayer	68de2115ca	avformat/tee: print errors for each failed bitstream filter Fixes CID1108584 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-26 21:08:44 +02:00
Michael Niedermayer	af165acefa	avformat/movenc: dont store invalid tapt atom Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-25 21:51:34 +02:00
Michael Niedermayer	c9e0f7a080	Merge commit '99e22b7859177f6d3ed6121040924b337dce5497' * commit '99e22b7859177f6d3ed6121040924b337dce5497': mov: Emit the correct tags for clcp tracks Conflicts: libavformat/movenc.c See: `a5f6720f13` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-25 21:33:18 +02:00
Don Moir	62056d09b1	avformat/avidec: skip len=0 entries from the index Reduces cpu & memory requirements for the index See Ticket 3531 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-25 18:56:05 +02:00
Miles Gould	99e22b7859	mov: Emit the correct tags for clcp tracks Bug-Id: 664 Signed-off-by: Luca Barbato <lu_zero@gentoo.org>	2014-04-25 17:38:19 +02:00
Aidan Skinner	802385dbc2	mov: Write prof section of tapt tag Signed-off-by: Luca Barbato <lu_zero@gentoo.org>	2014-04-25 17:38:19 +02:00
Michael Niedermayer	e148a5820d	Merge remote-tracking branch 'cehoyos/master' * cehoyos/master: Enable muxing ac-3 in caf. Use correct msvc type specifiers for ptrdiff_t and size_t. Fix vf_eq.c and vf_eq2.c compilation with !HAVE_6REGS. Fix libpostproc compilation with !HAVE_6REGS. Never write 0 as maximum bitrate for asf files. Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-25 01:56:23 +02:00
Michael Niedermayer	ca9cc6fdcc	Merge commit '152b797cd687e96a582a1cb908dddf3d330d7637' * commit '152b797cd687e96a582a1cb908dddf3d330d7637': flv: Do not mangle dts values for negative cts Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-24 21:50:28 +02:00
Michael Niedermayer	7da5ff5c18	Merge commit '5d983fdbca5570a1545a892583a372cfb3fffe92' * commit '5d983fdbca5570a1545a892583a372cfb3fffe92': flv: Warn only once Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-24 21:37:26 +02:00
Michael Niedermayer	277ae5a7b3	Merge commit '374fdc8c071dcd96422378b0a1a0d453336d8a01' * commit '374fdc8c071dcd96422378b0a1a0d453336d8a01': flv: Improve log messages Conflicts: libavformat/flvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-24 21:27:09 +02:00
Carl Eugen Hoyos	18e7e21e2f	Enable muxing ac-3 in caf. The files play fine with QuickTime.	2014-04-24 18:02:20 +02:00
Carl Eugen Hoyos	ced0d6c14d	Use correct msvc type specifiers for ptrdiff_t and size_t. The Windows runtime aborts if it finds %t or %z. Fixes ticket #3472. Reviewed-by: Ronald Bultje	2014-04-24 18:01:30 +02:00
Carl Eugen Hoyos	eeee59ba4d	Never write 0 as maximum bitrate for asf files. WMP refuses to play such streams.	2014-04-24 17:47:49 +02:00
Michael Niedermayer	fc145e576a	avformat/h263dec: Fix h263 probe The code was missing 1 bit in the src format Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-23 21:54:13 +02:00
Luca Barbato	152b797cd6	flv: Do not mangle dts values for negative cts Some applications really mean to send negative pts.	2014-04-23 21:20:17 +02:00
Luca Barbato	5d983fdbca	flv: Warn only once No point in sending the message multiple time.	2014-04-23 21:19:27 +02:00
Luca Barbato	374fdc8c07	flv: Improve log messages Messages should start with a capital letter and possibly end with a "." if they are statements.	2014-04-23 21:04:20 +02:00
Michael Niedermayer	56efd98a65	Merge commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd' * commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd': On2 AVC decoder Conflicts: Changelog configure libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-23 20:47:13 +02:00
Kostya Shishkov	e2834567d7	On2 AVC decoder	2014-04-23 19:57:44 +02:00
kyh96403	f21c263c89	avformat/rtmppkt: Fix random crash Fixes Ticket3564 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-23 15:10:42 +02:00
Michael Niedermayer	dc6a17cf74	avformat/mux: Check for and remove invalid packet durations Fixes assertion failure Fixes Ticket3575 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-23 06:55:33 +02:00
Michael Niedermayer	b9017fdd42	avformat/flvdec: also include file position in debug output Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-23 03:55:41 +02:00
Reimar Döffinger	3bd7a7149f	Add missing ';'. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>	2014-04-22 20:44:31 +02:00
Reimar Döffinger	8cbf0827e1	Various small spelling fixes. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>	2014-04-22 20:44:31 +02:00
Michael Niedermayer	f1c48c3a4d	avformat/mpegtsenc: make the pes packet length omission optional Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-22 16:11:12 +02:00
Graham Booker	60fcc19b90	avformat/mpegtsenc: Changed Video PES packet length to 0. The rational for this is another issue that plex has exposed. When it is conducting a transcode of video to HLS for streaming, my father noticed artifacts when played on his GoogleTV (NSZ-GT1). He sent me a test file and I reproduced it on my device of the same model. It is important to note that the artifacts were not present when streaming to VLC or QuickTime Player. I copied the command-line that plex used, and conducted all of the following tests using FFmpeg git. Transcode to HLS: artifacts on playback Transcode to TS: playback is fine Cat HLS segments into a single TS: playback is fine Segment single TS file to segments: artifacts on playback Segment single TS file to segments using Apple's HLS segmenter: playback is fine At this point I carefully examined the differences between Apple's HLS segmenter output and FFmpeg's. Among the considerable differences, I noticed that the video PES packets always had a 0 length. So I continued: Transcode to HLS using FFmpeg with 0 length PES packets: playback is fine. Segment single TS to segments with 0 length PES packets: playback is fine. All failures mentioned are only on the GTV since it is the only player on which I could reproduce artifacts. I only tested the GTV, VLC, and QuickTime Player though, so my test case is limited. I do not know if other players exhibit this issue. Since it was useful last time, I have uploaded the test file as hls_pes_packet_length.m4v along with its associated txt file which contains the transcode command-line that was used. Reviewed-by: Kieran Kunhya <kierank@obe.tv> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-22 16:05:25 +02:00
Michael Niedermayer	8064c6ac5f	Merge commit 'f9157463dbcd2db8fe9504197c0c04d0d7d04f31' * commit 'f9157463dbcd2db8fe9504197c0c04d0d7d04f31': lavf: do not use the parser duration for video Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-22 13:56:29 +02:00
Michael Niedermayer	57123dc67e	Merge commit 'a4ed995cabf220029f1d0e185a6fb45eed7b4091' * commit 'a4ed995cabf220029f1d0e185a6fb45eed7b4091': txd: do not set the codec timebase. Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-22 13:30:23 +02:00
Anton Khirnov	f9157463db	lavf: do not use the parser duration for video The parser has no way of knowing video duration, and therefore no video parsers set it.	2014-04-22 07:46:03 +02:00
Anton Khirnov	a4ed995cab	txd: do not set the codec timebase. It is not supposed to be changed from outside of lavc. Set the stream timebase and average framerate instead.	2014-04-22 07:44:16 +02:00
Michael Niedermayer	57fb570908	avformat/avidec: Speed up keyframe detection code Fixes Ticket3531 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-22 04:33:20 +02:00
Michael Niedermayer	f3743901d7	avformat: Fix decoder search in find stream info Fixes Ticket3548 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-21 05:27:08 +02:00
Michael Niedermayer	369cdf917a	avformat/asfenc: dont allow non interleaved packets The muxer does not support this currently Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-21 02:49:05 +02:00
Michael Niedermayer	5b19fc7aae	avformat/pmpdec: remove cur_dts timestamp hack It appears the demuxer works fine without it Fixes Ticket3534 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-21 01:29:08 +02:00
Lukasz Marek	4d09bc9897	lavf/pcm: remove redundant check Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-20 20:56:02 +02:00
Peter Ross	f57ac37228	avformat/iff: extend IFF demuxer to decode DSDIFF 64-bit chunks Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-20 00:22:20 +02:00
Michael Niedermayer	01a39a978c	Merge commit '55ddd700c67529ff2c6c4e976673f1341bba7a82' * commit '55ddd700c67529ff2c6c4e976673f1341bba7a82': Silicon Graphics Movie demuxer Conflicts: Changelog libavformat/mvdec.c libavformat/version.h See: `6fb40779cd` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-19 20:17:33 +02:00
Peter Ross	55ddd700c6	Silicon Graphics Movie demuxer Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>	2014-04-19 16:24:27 +02:00
Peter Ross	07761294fc	Silicon Graphics RLE 8-bit video decoder Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>	2014-04-19 16:24:26 +02:00
Peter Ross	ab683efb2b	Magic Lantern Video (MLV) demuxer Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-19 05:06:00 +02:00
Peter Ross	5331773cc3	ff_id3v2_read: add option to limit ID3 magic number search Several chunked formats (AIFF, IFF,DSF) store ID3 metadata within an 'ID3 ' chunk tag. If such chunks are stored sequentially, it is possible for the ID3v2 parser to confuse the chunk tag for the ID3 magic number. e.g. [1st chunk tag ('ID3 ') \| chunk size] [ID3 magic number \| metadata ...] [2nd chunk tag ('ID3 ') \| chunk size] [ID3 magic number \| metadata ...] Fixes ticket #3530. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-19 04:25:01 +02:00
Peter Ross	c94305ae23	ff_id3v2_free_extra_meta: set the pointer pointing to extra_meta to NULL Fixes ticket #3530. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-19 04:24:24 +02:00
csheng	549bbdfb4b	avformat/wavdec: enlarge probe_packets for wav fix issue https://trac.ffmpeg.org/ticket/3550 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-19 03:54:10 +02:00
Peter Ross	0a13487b1a	avformat/dsddec: create audio stream before processing id3 This ensures stream[0] is always the audio stream (an assumption made in dsf_read_packet). Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-18 14:33:57 +02:00
Peter Ross	27998451d8	DSD Stream File (DSF) demuxer Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-18 03:25:58 +02:00
Michael Niedermayer	97751e1324	avformat/replaygain: fix mixed declaration and statement Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-18 01:16:27 +02:00
Michael Niedermayer	cdc166acd8	Merge commit '32d05934abc7427bb90380a4c1ab20a15fd7d821' * commit '32d05934abc7427bb90380a4c1ab20a15fd7d821': mp3dec: decode more data from Info header Conflicts: libavformat/mp3dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-18 00:38:07 +02:00
Michael Niedermayer	39edcadc07	Merge commit 'fbd8e042107ec63e0ddf155588c59dcb76007641' * commit 'fbd8e042107ec63e0ddf155588c59dcb76007641': mp3dec: move XING/Info and VBRI parsing into their own functions Conflicts: libavformat/mp3dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-17 22:27:17 +02:00
Michael Niedermayer	d35efda21a	Merge commit 'ae43c10e36197000de2f3cc99ea35727ce98a796' * commit 'ae43c10e36197000de2f3cc99ea35727ce98a796': replaygain: allow exporting already decoded replaygain values Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-17 21:45:58 +02:00
Alessandro Ghedini	32d05934ab	mp3dec: decode more data from Info header Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-04-17 20:08:19 +02:00
Alessandro Ghedini	fbd8e04210	mp3dec: move XING/Info and VBRI parsing into their own functions Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-04-17 20:08:19 +02:00
Alessandro Ghedini	ae43c10e36	replaygain: allow exporting already decoded replaygain values This adds a function to export raw replaygain values (i.e. in the (u)int32_t form). It first checks whether AV_PKT_DATA_REPLAYGAIN side data is present, in which case it does nothing. Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-04-17 20:08:19 +02:00
Carl Eugen Hoyos	a3bd33af9e	Write sample_aspect_ratio to asf files. Fixes ticket #3528.	2014-04-17 14:55:49 +02:00
Carl Eugen Hoyos	6c18200c2f	Only insert the icpf atom in ProRes mkv packets if it isn't already present. The patch allows to read broken mkv files containing ProRes as written by the Haali muxer. Fixes a part of ticket #3434.	2014-04-17 14:46:11 +02:00
Anh	c150e2cf32	Fix compilation with --disable-everything --enable-muxer=avi --disable-network. Fixes ticket #3568.	2014-04-16 20:00:17 +02:00
Michael Niedermayer	dd77f6469a	avformat/ico: use avmalloc(z)_array() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-16 19:41:41 +02:00
Michael Niedermayer	572f5eb1af	avformat/mpegenc: try to improve the VBV buffer warning Maybe fixes Ticket 3494 Part of the message suggested by: rogerdpack Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-16 17:20:07 +02:00
Michael Niedermayer	ff6fa0b4b9	avformat/mpegts: Remove redundant check Fixes part of Ticket3466 Found-by: Andrey_Karpov / PVS-Studio Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-16 02:35:50 +02:00
Michael Niedermayer	79d82a6574	avformat/hnm: fix decoding of 256x256 video Fixes Ticket3464 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-16 01:37:38 +02:00
Michael Niedermayer	bdc812ab9e	avformat/flacdec/flac_read_timestamp: free the correct packet Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-16 00:23:31 +02:00
Michael Niedermayer	6d8ccc7ac7	avformat/flacdec/flac_read_timestamp: dont modify AVStream state Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-15 23:53:31 +02:00
Michael Niedermayer	eead2cddb7	avformat/xmv: use av_malloc_array() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-15 13:51:48 +02:00
Michael Niedermayer	337f74868c	avformat/mpegtsenc: use av_malloc_array() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-15 13:51:48 +02:00
Michael Niedermayer	083b6e739b	avformat/utils: fix typo Found-by: reimar Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-15 13:51:48 +02:00
Michael Niedermayer	ef818d8bf0	avformat: add av_format_inject_global_side_data(), and disable it by default After this commit applications needs to call av_format_inject_global_side_data() or handle AVStream side data by some other means if they want it not to be lost. This fixes a API incompatibility with libav. libav API does not allow the data to be passed through AVPackets Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-15 02:37:40 +02:00
Michael Niedermayer	b465aaa59f	avformat/img2dec: fix typo Found-by: Reimar Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-14 21:40:59 +02:00
Michael Niedermayer	3df787a1ef	Merge branch 'flac' of https://github.com/FernetMenta/FFmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-14 18:35:02 +02:00
Rainer Hochecker	e1fcd3a007	flac demuxer: improve seeking	2014-04-14 17:43:19 +02:00
Carl Eugen Hoyos	63c03ea98d	Fix writing RGB 5:5:5 rawvideo into avi. WMP expects bits per pixel to be set to 16 for RGB 5:5:5 rawvideo.	2014-04-14 15:34:38 +02:00
Stephan Soller	36b9c27dae	avformat/rtmpproto: Added handling of an initial RTMP chunk size packet. Fixes ticket #2911. Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-14 14:28:22 +02:00
Michael Niedermayer	8e5f840472	Merge commit '6477139721f559b26eafd415e23e13ea2b0c27e1' * commit '6477139721f559b26eafd415e23e13ea2b0c27e1': rtmpproto: Make sure to pass on the error code if read_connect failed Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-14 14:12:47 +02:00
Stephan Soller	4d40e073dc	rtmpproto: Handle RTMP chunk size packets before the connect packet In all other cases where ff_rtmp_packet_read is used, the packet returned is passed to rtmp_parse_result more or less immediately. In this single case, the content of the packet was required to be a connect packet. Some clients, e.g. Open Broadcaster Software, send a chunk size packet before the connect packet. If the first packet is a chunk size packet, handle it and read another one, requiring this to be a connect packet instead. Signed-off-by: Martin Storsjö <martin@martin.st>	2014-04-14 11:09:26 +03:00
Martin Storsjö	6477139721	rtmpproto: Make sure to pass on the error code if read_connect failed Previously, if read_connect failed, the ret variable was unmodified and had the value 0, indicating success, which then was returned from the rtmp_open function, even though it actually failed. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>	2014-04-14 11:09:20 +03:00
Michael Niedermayer	2ebacb0fc4	avformat/network: use av_malloc_array() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-13 23:39:49 +02:00
Michael Niedermayer	eccec20397	avformat/mp3enc: drop redundant and uninitialized variable Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-13 20:03:24 +02:00
Michael Niedermayer	82796aacab	avformat/utils: reinject global side data on seeks This fixes ffplay replaygain with seeking Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-13 18:27:05 +02:00
Michael Niedermayer	c0d62d999d	avformat/utils: factorize if() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-13 18:02:42 +02:00
Michael Niedermayer	289f02f923	avformat/utils: Inject global side data into first packet. This fixes replaygain handling in ffplay and probably other applications. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-13 18:02:05 +02:00
Peter Ross	e311b7446a	avformat/iff: indent Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-13 14:48:36 +02:00
Peter Ross	d95c9679f7	avformat/iff: remove unused code bits_per_coded_sample and block_align are calculated again at end of if() block Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-13 14:48:29 +02:00
Michael Niedermayer	571d2ffa47	Merge commit '617a1a98a6be3e59db6fbfc21afab2fb9a049c03' * commit '617a1a98a6be3e59db6fbfc21afab2fb9a049c03': mp3enc: Properly write bitrate value in XING header Conflicts: libavformat/mp3enc.c See: `40176fc314` See: `d62bf5d4e7` See: various others Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-12 21:26:20 +02:00
Michael Niedermayer	617a1a98a6	mp3enc: Properly write bitrate value in XING header Instead of using a fixed bitrate_idx, calculate a matching bitrate for the XING header. Using a fixed bitrate_idx causes tools such as file(1) and mediainfo(1) to report wrong bitrate and bitrate mode when using CBR. Bug-Id: https://bugs.debian.org/736088 Signed-off-by: Luca Barbato <lu_zero@gentoo.org>	2014-04-12 13:29:55 +02:00
Michael Niedermayer	f683895dee	avformat/img2dec: support nanosecond file times Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-12 04:52:01 +02:00
Michael Schenk	513a431e07	avformat/hls: reduce memory usage by using dynamically allocated url/key Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>	2014-04-12 03:14:52 +03:00
Carl Eugen Hoyos	c43222f436	Improve amr bitrate calculation for VBR files. Fixes ticket #3541.	2014-04-11 23:38:53 +02:00
Carl Eugen Hoyos	8b122937af	Warn if rawvideo and an unreadable pix_fmt are written. Print an error if a combination of rawvideo and an unusual pix_fmt that will be impossible to decode are written to avi or mov. Fixes ticket #3545.	2014-04-11 23:35:11 +02:00
Lukasz Marek	6db42a2b6b	lavd: add device capabilities API Provides API to query device capabilities. Each device must implement callbacks to benefit from this API. Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>	2014-04-11 15:37:43 +02:00
Anssi Hannula	39b192b8e1	avformat/hls: do not call ffurl_seek/ffurl_size on crypto protocol ffurl_seek() will not work even when it should be a no-op, so do not call it on crypto protocol. Also replace use of ffurl_size() for the same reason. Reported-by: Michael Schenk <Michael.Schenk@albistechnologies.com> Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>	2014-04-11 00:04:34 +03:00
James Almer	09c1654208	lavf/rtspcodes: add missing header include Fixes make checkheaders Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-10 21:57:04 +02:00
Michael Niedermayer	4d4bc89409	avformat/mov: merge mov_read_custom_metadata() and mov_read_custom() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-10 21:25:51 +02:00
Michael Niedermayer	6e573b7759	Merge commit '9a07fac678a8540d076e635061bbaa4ed09a9431' * commit '9a07fac678a8540d076e635061bbaa4ed09a9431': mov: read hydrogenaudio replaygain information Conflicts: libavformat/Makefile libavformat/mov.c See: `37a15f3e66` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-10 21:25:15 +02:00
Anton Khirnov	9a07fac678	mov: read hydrogenaudio replaygain information	2014-04-10 13:53:32 +02:00
Lukasz Marek	e1c48e3593	lavf/utils: fix mem leak Calling avformat_free_context() right after avformat_alloc_output_context2() leaved option's default values not freed. Options were freed only in av_write_trailer(). Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-10 03:24:07 +02:00
Michael Niedermayer	421c116fc4	Merge remote-tracking branch 'cehoyos/master' * cehoyos/master: Fix a typo in amr.c. Remove an unneeded include of avassert.h from amr.c. Do not allow writing invalid wav channel layouts by default. Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-10 00:33:57 +02:00
Michael Niedermayer	968516cebf	avformat/nut: add ff_nut_audio_extra_tags to demuxer too Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-09 23:37:55 +02:00
Carl Eugen Hoyos	cf79f20275	Fix a typo in amr.c.	2014-04-09 23:21:38 +02:00
Carl Eugen Hoyos	2a3ff9fbba	Remove an unneeded include of avassert.h from amr.c.	2014-04-09 23:21:38 +02:00
Carl Eugen Hoyos	bf87d582b1	Do not allow writing invalid wav channel layouts by default. Neither WMP nor QT play wav files with too large channel layouts. Fixes ticket #3543.	2014-04-09 23:21:38 +02:00
Vittorio Giovara	b6a09ef700	rawvideo: Support decoding YVYU422 FourCC	2014-04-08 23:24:36 +02:00
Anshul Maheshwari	5b30f27592	rtspcodes: don't check for >0 on error codes macro Avoids a warning with gcc 4.7 and -Wtype-limits. Albeit superfluous (At least gcc 4.8 didnt consider this been a problem). Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>	2014-04-08 18:05:02 -03:00
Schenk, Michael	845414bbb1	avformat/oggdec: reset nstreams in close Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-07 14:55:35 +02:00
Schenk, Michael	b0a8521383	avformat/mov: reset drefs_count in close Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-07 14:51:36 +02:00
Reynaldo H. Verdejo Pinochet	5267a5d783	rtspcodes: add full list of RTSP status codes Also add reason phrases from http://www.ietf.org/rfc/rfc2326.txt and macro to translate. Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>	2014-04-07 00:24:00 -03:00
Michael Niedermayer	01a5d71789	Merge remote-tracking branch 'cehoyos/master' * cehoyos/master: Set Matroska private data when muxing Prores. Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-06 23:57:42 +02:00
Carl Eugen Hoyos	3d5c859fa6	Set Matroska private data when muxing Prores. The specification requires the mov code point to be written as "fourcc".	2014-04-06 23:35:17 +02:00
Michael Niedermayer	5297003aa7	Merge commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123' * commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123': LucasArts SMUSH demuxer Conflicts: Changelog doc/general.texi libavformat/smush.c libavformat/version.h See: `bef8fd7099` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-06 23:29:47 +02:00
Reimar Döffinger	a0568ed254	rtspdec: check for strchr returning NULL. Fixes CID 732244. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>	2014-04-06 22:04:03 +02:00
Michael Niedermayer	4ccd7cb45b	avformat/oggdec/ogg_read_packet(): factorize failure code path Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-06 18:10:47 +02:00
Michael Niedermayer	c1b24ca762	avformat/oggdec: check for av_packet_new_side_data() failure Fixes CID1197062 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-06 18:10:47 +02:00
Vladlen Y. Koshelev	cdbd9e218d	avformat/hls: support for seeking on event playlists This allows clients to seek between first played segment and the last one in the live stream playlist with #EXT-X-PLAYLIST-TYPE:EVENT attribute.	2014-04-06 17:55:04 +03:00
Anssi Hannula	f29cb45bf2	avformat/hls: flush the subdemuxer when seeking Since we are basically seeking the AVIOContext under the subdemuxer, we need to flush the subdemuxer to avoid old packets from being read from the packet queue after the seek. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>	2014-04-06 17:55:04 +03:00
Anssi Hannula	9aa0606e87	avformat/hls: properly take stream_index into account when seeking Properly take stream_index into account so that a keyframe will be looked for in the specified stream_index only. Similarly, only check timestamp validity against the specified stream_index. Also remove code for stream_index == -1 case which does not actually happen as it is handled by generic code. This is based on an initial patch by James Deng. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>	2014-04-06 17:55:04 +03:00
Anssi Hannula	ad701326b4	avformat/hls: open playlists immediately when AVDISCARD_ALL is dropped Do not try to delay opening newly required playlists until a segment switch. Applications expect that newly selected undiscarded streams are available immediately, especially with alternative rendition streams (selectable audio/subtitle tracks). One might think that delaying variant stream switch until a segment switch would allow a "seamless" switch without us having to download a specific segment from two different variant playlists. However, that is not the case, since the application would have to keep the previous stream available (undiscarded) until the first packet of the newly selected stream arrives, but by that time the demuxer would have already downloaded the next segment of both variants. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>	2014-04-06 17:55:04 +03:00
Anssi Hannula	05ce529a59	avformat/hls: factor identical playlist allocations out of parse_playlist Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>	2014-04-06 17:55:03 +03:00
Anssi Hannula	6b4b73e75d	avformat/hls: do not use sequence numbers for packet ordering As per spec 3.4.3 ("A client MUST NOT assume that segments with the same sequence number in different Media Playlists contain matching content.") we cannot use sequence numbers for packet ordering. This can be seen e.g. in the subtitle streams of bipbop_16x9_variant.m3u8 that have considerably longer segments and therefore different numbering. Since the code now exclusively syncs using timestamps that may wrap, add some additional checking for that. According to the HLS spec all the timestamps should be in 33-bit MPEG format and synced together. v2: cleaner wrap detection v3: further wrap detection improvements Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>	2014-04-06 17:55:03 +03:00
Anssi Hannula	8fd6875c83	avformat/hls: do not care about stream start timestamps While selecting a packet to return to caller in read_packet(), the code corrects the timestamps for starting timestamps. However, this is wrong, since for live streams the initial timestamps might differ just because of the time delay between the retrieval of the various Media Playlists. Fortunately, spec 6.2.4 mandates that all variant streams must have matching timestamps, so we do not need to correct for initial timestamps. Drop the correction code. Note that ID3 timestamps were previously ignored, so this code was previously actually needed. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>	2014-04-06 17:55:03 +03:00
Anssi Hannula	d549b0910c	avformat/hls: avoid unnecessary segment retrievals Check if the playlist is still needed just before requesting the next segment instead of after exhausting the previous segment. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>	2014-04-06 17:55:03 +03:00
Anssi Hannula	4e85202bcc	avformat/hls: improve segment selection when restarting list reception Improve selection of the segment sequence number when restarting the reception of a playlist after it was suspended due to being unneeded (due to discard flags). The current code assumes that each playlist contains matching data with the same sequence number, while spec 3.4.3 specifically says that that is not the case. Often subtitle playlists also have longer target durations as well, causing the selection to be completely wrong. Instead prefer using the playlist segment duration information for non-live playlists, and other means if that is not possible. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>	2014-04-06 17:55:03 +03:00
Anssi Hannula	61e1a70278	avformat/hls: track seeking on a per-playlist basis Seeking needs to be tracked on a per-playlist basis, since the resyncing code in hls_read_packet() has to sync each playlist to the seek timestamp instead of stopping after the first playlist has reached it. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>	2014-04-06 17:55:03 +03:00
Anssi Hannula	01b184e68d	avformat/hls: parse ID3 timestamps for elementary audio streams HLS provides MPEG TS timestamps via ID3 tags in the beginning of each segment of elementary audio streams. v2: fix issues with streams that have multiple ID3 tags Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>	2014-04-06 17:55:03 +03:00
Anssi Hannula	1cb8d986b8	avformat/hls: split read_from_url() out of read_data() Useful for ID3 parsing. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>	2014-04-06 17:55:03 +03:00
Anssi Hannula	f7c7fc1369	avformat/hls: add some logging messages Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>	2014-04-06 17:55:02 +03:00
Anssi Hannula	da7759b357	avformat/hls: add support for byte-ranged segments Add support for EXT-X-BYTERANGE added in HLS protocol v4. v2: Better comment explaining ffurl_seek call and fix cur_seg_offset not being updated. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>	2014-04-06 17:55:02 +03:00
Anssi Hannula	cc1162d775	avformat/hls: always return EOF for unneeded playlist streams Even if we returned AVERROR_EOF previously due to playlist no longer being needed, we may still be called again, and we do not want to trigger a segment download in that case. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>	2014-04-06 17:55:02 +03:00
Anssi Hannula	edf4406c4d	avformat/hls: add support for alternative renditions HLS protocol version 4 added alternative renditions to the specification (e.g. alternative audio tracks). The EXT-X-MEDIA tags can also contain metadata for "renditions" (i.e. tracks) of the main Media Playlist. Add support for those. Note that the same rendition (AVStream) may be associated with multiple variants (AVPrograms). Alternative subtitle tracks will require additional work and are therefore not enabled yet. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>	2014-04-06 17:55:02 +03:00
Paul B Mahol	eeadcdfd1a	LucasArts SMUSH demuxer Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>	2014-04-06 16:41:41 +02:00
Michael Niedermayer	b978391ed5	avformat/oggparsevorbis: remove non functional null check Fixes CID1197055 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-06 01:34:48 +02:00
Michael Niedermayer	1fec720afa	avformat/cinedec: ask for sample when biBitCount isnt supported Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-06 00:34:09 +02:00
Michael Niedermayer	47b03415f3	avformat/cinedec: remove redundant zero termination Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-05 23:00:23 +02:00
Michael Niedermayer	af2e5061bb	avformat/mov: Fix width/height typo Fixes CID1197050 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-05 22:49:17 +02:00
Michael Niedermayer	49579c9637	avformat/cinedec: fix sizeof() Fixes CID1197047 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-05 22:37:10 +02:00
Michael Niedermayer	a84f9c75bc	avformat/omadec: fix probetest failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-05 22:07:43 +02:00
Thilo Borgmann	2f08dad028	lavf/avidec: Read metadata EXIF tags from AVIF tag. Based on patch by Gregory Wolfe (Kodak Alaris) <gregory.wolfe@kodakalaris.com>. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-05 03:32:06 +02:00
Carl Eugen Hoyos	90d93eeb38	Allow .y as extension for image2.	2014-04-05 02:18:09 +02:00
Carl Eugen Hoyos	9f4ab4e5f9	Show stream number when warning about stream without start time.	2014-04-05 01:15:12 +02:00
Carl Eugen Hoyos	87f2999641	Force gif aspect ratio multiplication to 64bit. Avoids a possible integer overflow.	2014-04-05 01:13:47 +02:00
Michael Niedermayer	849a8c4cdb	Merge commit '0048deb84cb6d22ba7f4fd7c8b4ecc054fcc22d4' * commit '0048deb84cb6d22ba7f4fd7c8b4ecc054fcc22d4': oggparsevorbis: export replaygain tags from Vorbis comments Conflicts: libavformat/Makefile libavformat/oggparsevorbis.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-04 23:17:33 +02:00
Michael Niedermayer	8e8c8607fc	Merge commit '1d55f8d5f6f2cd74fa27170e2be37a72441d9202' * commit '1d55f8d5f6f2cd74fa27170e2be37a72441d9202': flacdec: export replaygain tags from Vorbis comments Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-04 22:59:28 +02:00
Michael Niedermayer	c1d053621c	Merge commit '8542f9c4f17125d483c40c0c5723842f1c982f81' * commit '8542f9c4f17125d483c40c0c5723842f1c982f81': replaygain: correctly parse peak values Conflicts: libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-04 22:52:12 +02:00
Michael Niedermayer	6520613139	Merge commit '25b6837f7cacd691b19cbc12b9dad1ce84a318a1' * commit '25b6837f7cacd691b19cbc12b9dad1ce84a318a1': replaygain: fix gain sign decoding Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-04 22:44:17 +02:00
Alessandro Ghedini	0048deb84c	oggparsevorbis: export replaygain tags from Vorbis comments Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-04-04 17:40:51 +02:00
Alessandro Ghedini	1d55f8d5f6	flacdec: export replaygain tags from Vorbis comments Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-04-04 17:40:51 +02:00
Michael Niedermayer	b97f2c7c49	replaygain: remove unused variable Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-04-04 17:40:51 +02:00
Alessandro Ghedini	8542f9c4f1	replaygain: correctly parse peak values According to the ReplayGain spec, the peak amplitude may overflow and may result in peak amplitude values greater than 1.0 with psychoacoustically coded audio, such as MP3. Fully compliant decoders must allow peak overflows. Additionally, having peak values in the 0<->UINT32_MAX scale makes it more difficult for applications to actually use the peak values (e.g. when implementing clipping prevention) since values have to be rescaled down. This patch corrects the peak parsing by removing the rescaling of the decoded values between 0 and UINT32_MAX and the 1.0 upper limit. Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-04-04 17:40:19 +02:00
Peter Ross	0cc685e3ad	avformat/wtvdec: populate codec_tag from BITMAPINFOHEADER Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-04 17:20:38 +02:00
Peter Ross	8348bd198f	avformat/wtvdec: ignore MPEG2VIDEO extradata when count is invalid Fixes ticket #3522. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-04 17:11:47 +02:00
Alessandro Ghedini	25b6837f7c	replaygain: fix gain sign decoding The gain sign was incorrectly decoded: since the FFSIGN() macro treats 0 as negative, gain values starting with "0." were always decoded as negative. Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-04-04 17:04:37 +02:00
James Almer	0f62982335	oggenc: check return value of av_mallocz() Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-04 15:56:52 +02:00
Peter Ross	ac4b32df71	On2 VP7 decoder Further performance improvements and security fixes by Vittorio Giovara, Luca Barbato and Diego Biurrun. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Signed-off-by: Diego Biurrun <diego@biurrun.de>	2014-04-04 04:00:11 +02:00
Michael Niedermayer	634636eb5a	Merge remote-tracking branch 'qatar/master' * qatar/master: (31 commits) riff: Add an additional AAC TwoCC riff: support 0xa100 TwoCC for G723_1 riff: add 0x594a TwoCC for Xan DPCM riff: add 0x64 to g726 riff: add G723_1 wav tag riff: map 0x0038 to amrnb riff: Support FLIC FourCC riff: add escape130 FourCC riff: support 'aas4' FourCC riff: add "YUV8" FourCC riff: Add "S263" FourCC riff: Support XMPG as mpeg1 riff: support BW10 as mpeg1 riff: Add SLDV FourCC for dvvideo riff: Support NTSC forward dvcpro videos riff: add dvis/pdvc FourCCs riff: add "GXVE" FourCC for WMV2 riff: add PLV1 fourcc to mpeg4 riff: Support decoding ASP variant from QNAP Systems riff: add "SM4V" FourCC ... Conflicts: libavformat/riff.c See: various commits, all the merged changes where in ffmpeg already Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-04 02:54:53 +02:00
Michael Niedermayer	1946ad4d8c	Merge commit '121b5b7e0476d22408d748b914799b7c00acc3a4' * commit '121b5b7e0476d22408d748b914799b7c00acc3a4': isom: add some BOXX tags isom: add 'flic' tag isom: add 'm1v ' tag Conflicts: libavformat/isom.c See: `ca8623e1a5` See: `8a3f976498` See: `fca62f0500` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-04 02:44:56 +02:00
Michael Niedermayer	069e462beb	Merge commit 'ad8f736b7404503d8f5164f4879175a2258dd64b' * commit 'ad8f736b7404503d8f5164f4879175a2258dd64b': mxf: Remove typo also See: [FFmpeg-devel] [PATCH 3/3] lavf/mxfdec: delete trailing semi-colon Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-04 02:18:32 +02:00
Carl Eugen Hoyos	ce58ead40d	riff: Add an additional AAC TwoCC Mentioned on http://msdn.microsoft.com/en-us/library/dd341376%28prot.20%29.aspx	2014-04-04 01:29:29 +02:00
Piotr Bandurski	1e8c4fb8fc	riff: support 0xa100 TwoCC for G723_1 Sample-Id: 4790b7f1c44f98e35f3b806468fa615f5930a5b3.wav	2014-04-04 01:29:29 +02:00
Piotr Bandurski	00ccdcd88c	riff: add 0x594a TwoCC for Xan DPCM Sample-Id: crusader-no-regret.avi	2014-04-04 01:29:29 +02:00
Compn	7b600ea0da	riff: add 0x64 to g726 Sample-Id: g726-test1.wav	2014-04-04 01:29:28 +02:00
Piotr Bandurski	b7a12ab95b	riff: add G723_1 wav tag	2014-04-04 01:29:28 +02:00
Compn	10a14bd574	riff: map 0x0038 to amrnb Sample-Id: 40709.avi	2014-04-04 01:29:28 +02:00
Paul B Mahol	228af18a98	riff: Support FLIC FourCC	2014-04-04 01:29:28 +02:00
Michael Niedermayer	fb6c21fa8c	riff: add escape130 FourCC	2014-04-04 01:29:27 +02:00
Piotr Bandurski	ae58466994	riff: support 'aas4' FourCC	2014-04-04 01:29:27 +02:00
Piotr Bandurski	7100f3c07d	riff: add "YUV8" FourCC Sample-Id: MAILTEST.AVI	2014-04-04 01:29:27 +02:00
Piotr Bandurski	c9787f034c	riff: Add "S263" FourCC	2014-04-04 01:29:27 +02:00
Michael Niedermayer	9ff6429b07	riff: Support XMPG as mpeg1	2014-04-04 01:29:26 +02:00
Michael Niedermayer	771cb3e592	riff: support BW10 as mpeg1	2014-04-04 01:29:26 +02:00
Piotr Bandurski	eaec09a575	riff: Add SLDV FourCC for dvvideo	2014-04-04 01:29:25 +02:00
Carl Eugen Hoyos	a1c58b3acd	riff: Support NTSC forward dvcpro videos PAL looks incorrect.	2014-04-04 01:29:25 +02:00
Piotr Bandurski	6aa7cbd58c	riff: add dvis/pdvc FourCCs	2014-04-04 01:29:24 +02:00
Piotr Bandurski	adf0ff0000	riff: add "GXVE" FourCC for WMV2 Sample-Id: vivd.avi	2014-04-04 01:29:24 +02:00
Compn	96dd7b2332	riff: add PLV1 fourcc to mpeg4 Sample-Id: york-water-meteor.avi	2014-04-04 01:29:24 +02:00
Carl Eugen Hoyos	f5f18aecef	riff: Support decoding ASP variant from QNAP Systems	2014-04-04 01:29:23 +02:00
Piotr Bandurski	ade32b4a84	riff: add "SM4V" FourCC	2014-04-04 01:29:23 +02:00
Compn	684e43c5e3	riff: add DYM4 mpeg4 fourcc	2014-04-04 01:29:23 +02:00
Piotr Bandurski	32b0942c99	riff: add DM4V FourCC	2014-04-04 01:29:23 +02:00
Compn	fa6a021121	riff: add G264 to mpeg4, only decodes keyframes	2014-04-04 01:29:22 +02:00
Piotr Bandurski	9ab2d5a33c	riff: add "lsvm" FourCC for H263.	2014-04-04 01:29:22 +02:00
Carl Eugen Hoyos	915524e541	riff: Support H.264 fourcc UMSV	2014-04-04 01:29:22 +02:00
Carl Eugen Hoyos	dcb6e145eb	riff: add FourCC for GeoVision cameras	2014-04-04 01:29:22 +02:00
Carl Eugen Hoyos	9d9d319a3c	riff: Add V264 for H264 in CCTV recordings	2014-04-04 01:29:21 +02:00
Carl Eugen Hoyos	51ace0fb92	riff: add H264 from QNAP Systems	2014-04-04 01:29:21 +02:00
Piotr Bandurski	a52a1bc912	riff: add SMV2 FourCC for H264 Sample-Id: smv2.avi	2014-04-04 01:29:21 +02:00
Clément Bœsch	235bf1dab5	riff: add ISMP/timecode tag	2014-04-04 00:28:28 +02:00
James Almer	fa570a5548	riff: Add ITRK tag Some players, like foobar2000 or modern versions of WMP, create WAV files using the ITRK tag for track instead of IPRT	2014-04-04 00:28:28 +02:00
Piotr Bandurski	121b5b7e04	isom: add some BOXX tags	2014-04-04 00:20:12 +02:00
Reimar Döffinger	b0a54516eb	isom: add 'flic' tag	2014-04-04 00:20:12 +02:00
Carl Eugen Hoyos	5a85cf0fc2	isom: add 'm1v ' tag Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>	2014-04-04 00:20:10 +02:00
Luca Barbato	ad8f736b74	mxf: Remove typo Reported-By: Vittorio Giovara <vittorio.giovara@gmail.com>	2014-04-03 23:45:05 +02:00
Roman Fietze	74aeb6b584	libavformat/utils.c: av_pkt_dump_log2: use const pointers Use const pointers to AVPacket and AVStream. Signed-off-by: Roman Fietze <roman.fietze@telemotive.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-03 13:31:13 +02:00
Michael Niedermayer	f359bac27c	avformat/hlsenc: remove unneeded l prefix from %lf Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-03 00:27:53 +02:00
Senthilnathan M	96b8e7a9cd	hlsenc: added floating point time support. Necessary for HLS version 3 and above. Fixes ticket #3505. Signed-off-by: Senthilnathan M <senthil.codr@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-02 23:06:21 +02:00
Michael Niedermayer	4754d4b372	Merge remote-tracking branch 'cehoyos/master' * cehoyos/master: Write aspect ratio when muxing gif. Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-02 22:46:57 +02:00
Michael Niedermayer	cc8b45c0ce	avformat/avidec: remove unused variables Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-02 19:04:58 +02:00
Michael Niedermayer	91a0d3af65	Merge commit '9d599e3f6e61438772d8cddd6c9b7c495251f51e' * commit '9d599e3f6e61438772d8cddd6c9b7c495251f51e': avi: Improve non-interleaved detection Conflicts: libavformat/avidec.c See: `8df774be88` and others Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-02 18:03:02 +02:00
Michael Niedermayer	9d599e3f6e	avi: Improve non-interleaved detection Additional fixes by Nigel Touati-Evans <nigel.touatievans@gmail.com>. Check the index for streams with a time drift of 2s or a buffer drift of 64MB. Bug-Id: 666 CC: libav-stable@libav.org Sample-Id: yet-another-broken-interleaved-avi.avi Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Signed-off-by: Diego Biurrun <diego@biurrun.de>	2014-04-02 12:11:31 +02:00
Carl Eugen Hoyos	45782a98b6	Write aspect ratio when muxing gif.	2014-04-02 09:49:30 +02:00
Michael Niedermayer	61b3b3315c	Merge commit 'f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509' * commit 'f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509': lavf: add supported extension to avi and mov demuxers Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-02 03:15:19 +02:00
Michael Niedermayer	45ba9d8545	Merge commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e' * commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e': More correct printf format specifiers Conflicts: libavcodec/h264_ps.c libavcodec/h264_refs.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-02 02:54:09 +02:00
Marc-Antoine Arnaud	f1c4a54f6e	lavf: add supported extension to avi and mov demuxers	2014-04-02 00:27:53 +02:00
Diego Biurrun	cba4e6062a	More correct printf format specifiers This avoids compiler warnings about argument and specifier type mismatch.	2014-04-02 00:27:22 +02:00
Jimmy Christensen	38389058c3	OpenEXR decoder Additional fixes and enhancements by Vittorio Giovara, Gonzalo Garramuno, Nicolas George, Paul B Mahol and Michael Niedermayer. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>	2014-04-01 01:13:09 +02:00
Michael Niedermayer	1f361124d9	avformat/img2dec: zero probe buffer Fixes use of uninitialized memory Fixes valgrind failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-31 23:47:29 +02:00
Michael Niedermayer	9d013fe840	Merge remote-tracking branch 'qatar/master' * qatar/master: mov: Unbreak sbtl writing Conflicts: libavformat/movenc.c See: `8a9d0a1561` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-31 22:08:11 +02:00
Michael Niedermayer	f94371b1db	mov: Unbreak sbtl writing	2014-03-31 19:31:41 +02:00
Michael Niedermayer	1ffbaa88c9	Merge commit 'fce28c3c6d603b7f42a5dbe36bf240d0470469c8' * commit 'fce28c3c6d603b7f42a5dbe36bf240d0470469c8': mov: fill in subtitle dimensions after parsing tkhd See: `8ba432bc56` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-31 01:58:14 +02:00
Michael Niedermayer	12789d9636	mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions from tkhd This also moves mov_rewrite_dvd_sub_extradata() to mov.c. Sample-Id: NeroRecodeSample.mp4	2014-03-31 01:08:23 +02:00
Michael Niedermayer	fce28c3c6d	mov: fill in subtitle dimensions after parsing tkhd Sample-Id: NeroRecodeSample.mp4	2014-03-31 01:08:18 +02:00
Michael Niedermayer	96138e8c8d	isom: only write the size if its non zero in mov_rewrite_dvd_sub_extradata() Sample-Id: NeroRecodeSample.mp4	2014-03-31 01:08:12 +02:00
Michael Niedermayer	9bd4a9f4ee	isom: Simplify mov_rewrite_dvd_sub_extradata() This avoids the 2nd buffer and fixes the palette truncated check	2014-03-31 01:05:11 +02:00
Peter Ross	92d657b5f1	avformat/wtvenc: advise user when H264 startcode is not present Fixes ticket #3473. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-30 16:36:47 +02:00
Peter Ross	e61973db6c	avformat/mpegtsenc: move startcode validity check to ff_check_h264_startcode Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-30 16:36:22 +02:00
Michael Niedermayer	7aa3979b8c	avformat/avio: also set generic URL context options This should have no effect currently as there are no such options yet. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-30 15:00:03 +02:00
Peter Ross	31ac3f306c	avformat/wtvenc: pad judiciously when writing mpeg2 extradata Padding rule described here http://msdn.microsoft.com/en-us/library/windows/desktop/dd390707(v=vs.85).aspx Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-30 06:22:54 +02:00
Peter Ross	73a2d16bfa	avformat/wtvdec: demux mpeg2 extradata Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-30 06:22:50 +02:00
Michael Niedermayer	c01ddf845d	avformat/replaygain: remove unused variable Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-30 03:23:13 +02:00
Michael Niedermayer	8a9d0a1561	avformat/movenc: fix if vs if else Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-29 15:38:20 +01:00
Michael Niedermayer	b8f5b0713e	Merge remote-tracking branch 'qatar/master' * qatar/master: movenc: Add dvd subtitle support Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-29 15:04:56 +01:00
Michael Niedermayer	657cee1aef	avformat/img2_alias_pix: rewrite probe function Fixes probetest failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-29 00:38:51 +01:00
Michael Niedermayer	2cffdcbdd7	avformat/img2dec: try to read PROBE_BUF_MIN instead of just enough for .pix probing Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-29 00:38:51 +01:00
Michael Niedermayer	1c13e1ef36	avformat/img2dec: Use avformat probing interface to identify format if it has not been otherwise identified This is used only for distinguishing .pix formats for now. Which is the only case that has image2 demuxers currently Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-28 23:54:51 +01:00
Michael Niedermayer	075d6c066b	avformat: add image2 brender pix demuxer Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-28 23:54:51 +01:00
Michael Niedermayer	13bcb4de33	avformat: add image2 alias pix demuxer Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-28 23:54:51 +01:00
Michael Niedermayer	067a9cf81a	avformat/img2dec: make image2dec capable to be used from seperate demuxers Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-28 23:54:51 +01:00
John Stebbins	6adf3bc42e	movenc: Add dvd subtitle support Signed-off-by: Luca Barbato <lu_zero@gentoo.org>	2014-03-28 17:15:30 +01:00
Michael Niedermayer	16ddc58bd7	Merge commit '70daeacd6ef8b354dd7d2d77ad393831a5bbf033' * commit '70daeacd6ef8b354dd7d2d77ad393831a5bbf033': PAF demuxer and decoder Conflicts: Changelog doc/general.texi libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/paf.c libavcodec/version.h libavformat/Makefile libavformat/allformats.c libavformat/paf.c libavformat/version.h See: `7de4a16508`, and others Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-28 04:32:05 +01:00
Paul B Mahol	70daeacd6e	PAF demuxer and decoder Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>	2014-03-27 23:34:47 +01:00
Michael Niedermayer	f392949f1a	Merge commit 'ae17878fb2ab100264226c84c58f5b95a703312f' * commit 'ae17878fb2ab100264226c84c58f5b95a703312f': BRender PIX image decoder Conflicts: doc/general.texi libavcodec/Makefile libavcodec/version.h See: `492a5f835c`, and others Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-27 21:09:17 +01:00
Aleksi Nurmi	ae17878fb2	BRender PIX image decoder Further enhancements by Vittorio Giovara and Paul B Mahol. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>	2014-03-27 18:27:23 +01:00
Michael Niedermayer	12ab07be44	Merge commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b' * commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b': Alias PIX image encoder and decoder Conflicts: Changelog libavcodec/allcodecs.c libavcodec/version.h libavformat/img2enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-27 01:10:28 +01:00
Michael Niedermayer	61b5ef7754	libavformat/aviobuf: keep track of the original buffer-size and restore it after probe/ensure-seekback Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-26 23:58:48 +01:00
Michael Niedermayer	0d4a66ee7f	avformat/aviobuf: ffio_ensure_seekback: only copy the initialized part of the buffer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-26 23:52:38 +01:00
Vittorio Giovara	e50f5d3cf9	Alias PIX image encoder and decoder	2014-03-26 23:25:02 +01:00
Carl Eugen Hoyos	0816abae1e	Add an .oga muxer.	2014-03-25 15:47:55 +01:00
Peter Ross	4a031ce3c6	avformat/riff: add On2 VP7 fourccs Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-25 13:29:29 +01:00
Michael Niedermayer	1034fbdf53	Merge commit '15c5a8d22d12d29a364ca2ab6438f1dee2fa08c7' * commit '15c5a8d22d12d29a364ca2ab6438f1dee2fa08c7': mp3dec: export replaygain tags from ID3v2 Conflicts: Changelog Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-24 15:11:08 +01:00
Michael Niedermayer	83e8978798	Merge commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78' * commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78': Add replaygain side data type and code for parsing replaygain tags. Conflicts: libavcodec/avcodec.h libavcodec/version.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-24 14:03:55 +01:00
Michael Niedermayer	595ba3b962	Merge commit '25b32586566f285d797737863c97a1c5c9c84e2b' * commit '25b32586566f285d797737863c97a1c5c9c84e2b': lavf: add an AVStream field for exporting stream-global side data Conflicts: libavformat/utils.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-24 13:41:49 +01:00
Anton Khirnov	15c5a8d22d	mp3dec: export replaygain tags from ID3v2	2014-03-24 06:13:39 +01:00
Anton Khirnov	5a7e35dd23	Add replaygain side data type and code for parsing replaygain tags.	2014-03-24 06:07:51 +01:00
Anton Khirnov	25b3258656	lavf: add an AVStream field for exporting stream-global side data	2014-03-24 06:07:51 +01:00
Michael Niedermayer	fecebb7aba	Merge commit '5b8f0a5eac75d16376af60a6f6bb79b3e9e6dab7' * commit '5b8f0a5eac75d16376af60a6f6bb79b3e9e6dab7': mpeg: K&R formatting cosmetics Conflicts: libavformat/mpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-24 05:28:07 +01:00
Tanja Batchelor	5b8f0a5eac	mpeg: K&R formatting cosmetics Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>	2014-03-24 02:22:15 +01:00
Nicolas George	26dea7731e	lavf/concatdec: allow to match streams by id. That makes the concat demuxer usable with MPEG-PS streams, even when the streams in the different parts are detected in different order.	2014-03-23 19:15:07 +01:00
wm4	686e662676	http: restructure http_connect error handling path The authstr memory allocations make it annoying to error in the middle of the header setup code, so apply the usual C error handling idiom to make it easier to error at any point. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-23 05:56:35 +01:00
Michael Niedermayer	802e5fc8f8	Merge commit '1e9db41e2a2166be5671b088ef4ad06a40af459f' * commit '1e9db41e2a2166be5671b088ef4ad06a40af459f': movenc: Allow override of major brand in ftyp atom Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-23 03:22:20 +01:00
John Stebbins	1e9db41e2a	movenc: Allow override of major brand in ftyp atom Signed-off-by: Tim Walker <tdskywalker@gmail.com>	2014-03-23 00:31:54 +01:00
Michael Niedermayer	2765c2ec7d	Merge remote-tracking branch 'cus/stable' * cus/stable: mpegts: fix teletext pts of streams with standalone pcr pid mpegts: add pcr filter for tracking standalone pcr pids mpegts: factorize mpegts filter creator code mpegts: move last_pcr to MpegTSFilter level Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-22 23:50:49 +01:00
rogerdpack	0b4c5c99bc	avformat/udp: cleanup comments, add a warning if receive buffer is unexpectedly unable to be set high enough which can happen easily in linux Signed-off-by: rogerdpack <rogerpack2005@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-22 16:40:46 +01:00
Marton Balint	d2f60547c2	mpegts: fix teletext pts of streams with standalone pcr pid Signed-off-by: Marton Balint <cus@passwd.hu>	2014-03-22 13:55:01 +01:00
Marton Balint	d83a5b5218	mpegts: add pcr filter for tracking standalone pcr pids Signed-off-by: Marton Balint <cus@passwd.hu>	2014-03-22 13:55:01 +01:00
Marton Balint	6bab55b84c	mpegts: factorize mpegts filter creator code Signed-off-by: Marton Balint <cus@passwd.hu>	2014-03-22 13:54:59 +01:00
Marton Balint	4acc86bcfb	mpegts: move last_pcr to MpegTSFilter level Signed-off-by: Marton Balint <cus@passwd.hu>	2014-03-22 13:41:22 +01:00
Michael Niedermayer	d003a0cd2e	avformat/mp3enc: use av_copy_packet() Fixes double free Fixes Ticket3476 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-22 01:26:48 +01:00
wm4	76c8fbc5f2	http: never send 'Cookie: (null)' to the server If a domain has some cookies set, but matching the cookie fails due to the port being different, get_cookies() succeeds, but sets cookies to NULL. The caller of get_cookies() didn't check for the NULL value. This also avoids passing NULL to libc string functions, which is undefined behavior Fixes Ticket2180 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-21 20:32:09 +01:00
Michael Niedermayer	2ef6c0fdf5	Merge commit 'af9481d7019d46c9f18c4ccac77a5d0c54cf6004' * commit 'af9481d7019d46c9f18c4ccac77a5d0c54cf6004': mxf: Lowercase UL strings Conflicts: libavformat/mxfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-19 21:09:16 +01:00
Michael Niedermayer	3e59db606e	Merge commit '6920fb2b33f84b114ea4561ae1c623f4a26562e5' * commit '6920fb2b33f84b114ea4561ae1c623f4a26562e5': mxf: Verbose debug logging Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-19 20:54:35 +01:00
Michael Niedermayer	8263c14691	Merge commit '842ea36c747eb6537c4236114346cb7a3e9a8df1' * commit '842ea36c747eb6537c4236114346cb7a3e9a8df1': mxf: Override faulty PreviousPartition entries Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-19 20:46:52 +01:00
Michael Niedermayer	bd9e0127c9	Merge commit '92ebb332157195b7c1212e734c5668afbf19cf2b' * commit '92ebb332157195b7c1212e734c5668afbf19cf2b': mxf: Add additional H264 PictureEssenceCoding Conflicts: libavformat/mxf.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-19 20:39:05 +01:00
Luca Barbato	af9481d701	mxf: Lowercase UL strings The specification uses lower case most of the time.	2014-03-19 12:04:15 +01:00
Luca Barbato	6920fb2b33	mxf: Verbose debug logging Print the UL in code format and in the short format used by the specification.	2014-03-19 12:04:06 +01:00
Luca Barbato	842ea36c74	mxf: Override faulty PreviousPartition entries Some files set the PreviousPartition field to point to its own offset. If we are parsing forward the Previous partition is immediately known and its value could be used, otherwise we can safely point to the header. Reported-By: Jean Baptiste Kempf <jb@videolan.org>	2014-03-19 11:56:33 +01:00
Luca Barbato	92ebb33215	mxf: Add additional H264 PictureEssenceCoding Unbreak some MXF Proxy files.	2014-03-19 11:51:08 +01:00
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
Ben Littler	fb0a988f94	riff: IPJ2 decodes with JPEG2000 decoder Samples can be made from mencoder and jp2avi.dll codec.	2014-03-09 18:09:39 +01:00
Piotr Bandurski	db32f14c3d	isom: add "MNG" FourCC	2014-03-09 18:09:39 +01:00
Baptiste Coudurier	9e71cc81f3	movdec: handle 0x7fff langcode as macintosh per the specs The correct point that seperates ISO and MAC language codes is 0x400 according to the current QT spec. Old QT specs did not list where this seperation is but apparently only defined the meaning of the first 137.	2014-03-09 18:09:39 +01:00
Carl Eugen Hoyos	073cd30fb4	isom: Support MPEG-2 video mov files from FPC5	2014-03-09 18:09:39 +01:00
Piotr Bandurski	31e558fbcf	isom: add "NO16" FourCC	2014-03-09 18:09:39 +01:00
Carl Eugen Hoyos	eeae858596	isom: Support Sony XAVC in mov Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>	2014-03-09 18:09:38 +01:00
Piotr Bandurski	6509012398	isom: add Radius DV YUV FourCCs	2014-03-09 18:09:38 +01:00
Ben Littler	c09804684a	isom: add xd51 hdcam Someone needs to binary search FCP for new isom...	2014-03-09 18:09:38 +01:00
Michael Niedermayer	9827f3db88	Merge commit '565e0c6d866ce08d4b06427456d3d1f4fd856e9c' * commit '565e0c6d866ce08d4b06427456d3d1f4fd856e9c': movenc: allow override of "writing application" tag Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-09 01:50:17 +01:00
Michael Niedermayer	4cb6814160	Merge commit '0092c1dd8dac2d9e185b58503b447a0d3fb5230d' * commit '0092c1dd8dac2d9e185b58503b447a0d3fb5230d': matroskaenc: allow override of "writing application" tag Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-09 01:41:55 +01:00
John Stebbins	565e0c6d86	movenc: allow override of "writing application" tag Signed-off-by: Tim Walker <tdskywalker@gmail.com> CC: libav-stable@libav.org	2014-03-08 18:59:35 +01:00
John Stebbins	0092c1dd8d	matroskaenc: allow override of "writing application" tag Signed-off-by: Tim Walker <tdskywalker@gmail.com> CC: libav-stable@libav.org	2014-03-08 18:56:49 +01:00
Nicolas George	6bffa83bbe	lavf/concatdec: reindent after last commit.	2014-03-08 12:44:45 +01:00
Nicolas George	8a670f52a5	lavf/concatdec: more reliable test for absolute URLs. ff_make_absolute_url() recognizes the "://" pattern usual in HTTP-like protocols, but consider relative URLs starting with just the protocol name or using the comma syntax for options.	2014-03-08 12:38:31 +01:00
Nicolas George	97e87e09c8	lavf: add subfile protocol.	2014-03-08 12:36:57 +01:00
Michael Niedermayer	fabf69f37a	Merge commit 'f69befe5eefef12172a6479dd9cef3c01bddec7a' * commit 'f69befe5eefef12172a6479dd9cef3c01bddec7a': matroskadec: cosmetics: Fix "attachement" vs. "attachment" typo Conflicts: libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-03-08 00:13:20 +01:00

... 6 7 8 9 10 ...

15327 Commits