virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Code Issues Releases Activity
59,551 Commits 37 Branches 400 Tags 460 MiB
98ecbf0093
Commit Graph

14281 Commits

Author SHA1 Message Date
Michael Niedermayer
417927af3c hdsenc: Avoid integer overflow 
Also remove a silly leftover pair of parentheses.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-12-14 17:48:28 +02:00
Stefano Sabatini
2cfe70ff3e lavf/movenc: return meaningful error code from mov_write_header() 2013-12-14 13:21:58 +01:00
Stefano Sabatini
54c596fe7a lavf/movenc: improve feedback in case of unsupported codec 2013-12-14 13:21:51 +01:00
Michael Niedermayer
f5cf0ea93a avformat/asf: clear uninitialized areas of packets before returning them 
Fixes use of uninitialized variables
Fixes msan_uninit-mem_7f839282b6ce_7273_msn08_VBRq70_800x600.wmv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-13 23:32:45 +01:00
Michael Niedermayer
7d7a701362 avformat/ipmovie: Fix use of uninitialized memory in OPCODE_INIT_VIDEO_BUFFERS 
Fixes: msan_uninit-mem_7ffe323a25f3_5929_ipmovie_interplayvideo_interplay_dpcm__bislogo.mve
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-13 19:51:47 +01:00
Michael Niedermayer
7439475e69 avformat/network: check ff_socket_nonblock() return and print a debug message 
Fixes CID1026744
Fixes CID1026743

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-13 17:08:03 +01:00
Carl Eugen Hoyos
fb5518cfb7 Force one stream in caf muxer. 
Based on eeb975f5
 2013-12-13 11:57:39 +01:00
Michael Niedermayer
5d8e4f6da0 avformat/rtpenc: check av_packet_get_side_data() return, fix null ptr dereference 
Fixes CID1035715

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-13 02:09:20 +01:00
Michael Niedermayer
c5f15f40b9 avformat/rtpdec_h264: fix null pointer dereferences 
Fixes CID733716

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-13 02:09:20 +01:00
Michael Niedermayer
db8a53d86a avformat/sdp: fix memleak on error 
Fixes CID700640
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-13 00:27:25 +01:00
Michael Niedermayer
3dbf9afe85 libavformat/hdsenc: check init_file() return code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-12 21:04:24 +01:00
Michael Niedermayer
2644df82e6 Merge commit 'ae9d13f03e6c81ea00fafe6aa74b4a849ec8da1a' 
* commit 'ae9d13f03e6c81ea00fafe6aa74b4a849ec8da1a':
  img2: add stereo 3d still picture file extensions

Conflicts:
	libavformat/img2.c

See: 6fe12c7ff2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-12 19:48:36 +01:00
Michael Niedermayer
30aa9b727d Merge commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39' 
* commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39':
  rtsp: suppress a incompatible pointer types warning

Conflicts:
	libavformat/rtsp.c

See: 0079232299
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-12 19:37:46 +01:00
Michael Niedermayer
d780fdb904 avformat/hlsenc: copy metadata 
Fixes Ticket2296

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-12 18:41:39 +01:00
James Almer
c619e14c31 avformat/oggparseopus: Check opus_duration() return value 
Regression since 39d11d599c

os->pduration would be wrongly assigned a negative value on invalid packets
instead of aborting.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-12 17:26:19 +01:00
Carl Eugen Hoyos
9fa75be96d mpegts: add HEVC registration descriptor 2013-12-12 16:10:15 +01:00
Martin Lambers
ae9d13f03e img2: add stereo 3d still picture file extensions 2013-12-12 16:10:15 +01:00
Vittorio Giovara
46c0cbd5dc rtsp: suppress a incompatible pointer types warning 2013-12-12 16:10:14 +01:00
Michael Niedermayer
551a679795 avformat/oggdec: reset end_trimming when it has been used, so it cannot be used twice by mistake 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-12 05:33:21 +01:00
Dale Curtis
9c0dd7b462 avformat/oggdec: reset end_trimming in ogg_reset() 
Fixes the output when seeking back to the start

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-12 05:33:02 +01:00
Michael Niedermayer
3efe5e3b09 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rtspdec: Fix keep-alive request for ACTi cameras

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-12 00:41:02 +01:00
Michael Niedermayer
0506cc2cc3 Merge commit '281a40e18f923510f2067d05c5b0cf08cc49dfee' 
* commit '281a40e18f923510f2067d05c5b0cf08cc49dfee':
  lavf: remove an unneeded call to avcodec_get_frame_defaults().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-12 00:14:21 +01:00
Michael Niedermayer
4cbf3eb9e6 Merge commit 'eb891b3114f499e96b9faddd0b0ae856345dfbd9' 
* commit 'eb891b3114f499e96b9faddd0b0ae856345dfbd9':
  Replace all uses of avcodec_free_frame with av_frame_free().

Conflicts:
	doc/examples/decoding_encoding.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 23:18:51 +01:00
Rumin Sam
70e981cf5d rtspdec: Fix keep-alive request for ACTi cameras 
Some ACTi cameras fail if "*" is passed as the URI.

Signed-off-by: Ismael Luceno <ismael.luceno@corp.bluecherry.net>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-12-11 22:48:55 +02:00
Anton Khirnov
281a40e18f lavf: remove an unneeded call to avcodec_get_frame_defaults(). 
avcodec_decode_*() resets the frame itself.
 2013-12-11 20:39:55 +01:00
Anton Khirnov
eb891b3114 Replace all uses of avcodec_free_frame with av_frame_free(). 2013-12-11 20:39:54 +01:00
Michael Niedermayer
81c1197494 avformat/utils: Check avcodec_open2() return code in av_find_stream_info() 
Fixes CID1135750

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 20:32:05 +01:00
Michael Niedermayer
6722e564a8 avformat/hdsenc: fix off by 1 error in array size check 
Fixes CID1135763, CID1135764

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 20:23:31 +01:00
Michael Niedermayer
572965c9a6 avformat/hdsenc: fix unintentional integer overflow in hds_write_packet() 
Fixes CID1135762

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 16:33:26 +01:00
Michael Niedermayer
95d2fc6a76 avformat/hdsenc: Check rename() return value 
Fixes CID1135748
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 16:30:07 +01:00
Michael Niedermayer
7441d1ec33 avformat/aviobuf: fix null dereference in avio_close_dyn_buf() 
Fixes CID1135769

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 16:16:04 +01:00
Carl Eugen Hoyos
945a440d11 Force one stream for raw muxers. 
Based on eeb975f5
Fixes ticket #3217.

Reviewed-by: Nicolas George
 2013-12-11 13:15:49 +01:00
Michael Niedermayer
7f39352a1b avformat/oggparseopus: calculate pts/dts for initial packets after seeking 
based on code from oggparsevorbis
Fixes Ticket3124
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 05:00:50 +01:00
Michael Niedermayer
39d11d599c avformat/oggparseopus: factor opus_duration() out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 04:17:19 +01:00
Michael Niedermayer
8e702bd3a8 Merge commit 'd64341e498fa46c6cf4c23d408177d7489559654' 
* commit 'd64341e498fa46c6cf4c23d408177d7489559654':
  configure: Prefix libc-related variables with "libc_"

Conflicts:
	libavdevice/Makefile
	libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-09 20:52:14 +01:00
Carl Eugen Hoyos
362383b743 Fix remuxing of IMA_QT in mov. 
Fixes ticket #1603.
 2013-12-09 14:24:46 +01:00
Carl Eugen Hoyos
c5a837658a Do not detect "00000000..." (and other non-changing values) as adp. 2013-12-09 13:51:00 +01:00
Carl Eugen Hoyos
b8667bccad Revert: flvenc: Don't pretend to support muxing "plain" VP6 
Muxing VP6 is used by applications and works with Flashplayer.

Reported-by: David Bertrand
 2013-12-09 13:18:29 +01:00
Michael Niedermayer
9eac7c435f Merge commit 'f0b234ab9e406efee85c17eb435db646092a943b' 
* commit 'f0b234ab9e406efee85c17eb435db646092a943b':
  avformat: AviSynth demuxer rewrite

Conflicts:
	configure
	libavformat/avisynth.c

See: b9ad009475 (as well as later commits)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-09 12:03:09 +01:00
Diego Biurrun
d64341e498 configure: Prefix libc-related variables with "libc_" 
Simplifies host/target libc detection splitting.
 2013-12-09 11:47:43 +01:00
d s
f0b234ab9e avformat: AviSynth demuxer rewrite 
Directly loads AviSynth through LoadLibrary instead of relying on
Video for Windows, and supports using AvxSynth (via dlopen) to
open scripts on Linux and OS X.

Error messages from AviSynth/AvxSynth are now reported through
av_log and exit, rather than the traditional behavior of generating
an error video that the user would need to watch to diagnose.

The main rewrite was authored by d s <avxsynth.testing@gmail.com>
from the AvxSynth team, with additional contributions by

Oka Motofumi <chikuzen.mo@gmail.com>
Stephen Hutchinson <qyot27@gmail.com>
Diego Biurrun <diego@biurrun.de>
Anton Khirnov <anton@khirnov.net>

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-12-08 21:54:50 +01:00
Andrey Utkin
c1b9d7189d avformat/rtpdec: Enable GSM RTP depacketization 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-08 18:38:01 +01:00
Michael Niedermayer
7f763775aa avformat/utils: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-07 11:59:53 +01:00
Michael Niedermayer
1770da18f7 avformat/utils: reject poorly fitting rfps values earlier 
This avoids collecting statistics for rfps values that very likely
will get rejected later.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-07 04:20:05 +01:00
Michael Niedermayer
ba189b1db4 avformat/mov: use rfps_add_frame() only for video 
it makes no sense for other streams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-07 03:23:49 +01:00
James Almer
618bdb7f58 lavf/mux: Don't write "encoder" metadata tag when bitexact is requested 
Since we don't write lavf's string when bitexact is requested, this will
prevent the tag from being copied from the source stream.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-06 19:33:41 +01:00
Michael Niedermayer
133fbfc781 do O(1) instead of O(n) atomic operations in register functions 
about 1ms faster startup time

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-06 15:27:36 +01:00
James Almer
56572787ae Add Windows resource file support for shared libraries 
Originally written by James Almer <jamrial@gmail.com>

With the following contributions by Timothy Gu <timothygu99@gmail.com>

* Use descriptions of libraries from the pkg-config file generation function
* Use "FFmpeg Project" as CompanyName (suggested by Alexander Strasser)
* Use "FFmpeg" for ProductName as MSDN says "name of the product with which the
  file is distributed" [1].
* Use FFmpeg's version (N-xxxxx-gxxxxxxx) for ProductVersion per MSDN [1].
* Only build the .rc files when --enable-small is not enabled.

[1] http://msdn.microsoft.com/en-us/library/windows/desktop/aa381058.aspx

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-05 23:42:07 +01:00
Carl Eugen Hoyos
af7562a035 Ignore es_map_length when parsing mpeg program stream map. 
Fixes ticket #3195.
 2013-12-05 21:17:21 +01:00
Michael Niedermayer
e2bf00ce46 avformat/mov: calculate rfps from the first 100 frames of the index 
This reduces the amount of frames that need to be demuxed in av_find_stream_info()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-05 17:46:40 +01:00
Michael Niedermayer
1565a9a9e9 avformat/utils: factor rfps calculation out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-05 17:30:13 +01:00
Michael Niedermayer
dc1b0a54f9 avformat/utils: provide more IO statistics in debug output at start and end of av_find_streaminfo() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-05 16:09:11 +01:00
Michael Niedermayer
f3008f30fb avformat/utils: move update_wrap_reference() up 
simplifies code
also remove extra {}

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-04 14:36:36 +01:00
Michael Niedermayer
34b16e2d36 avformat/utils: reorder operations in update_wrap_reference() 
prevents a integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-04 14:36:35 +01:00
Rainer Hochecker
f65afef1df mpegts: do not set pts for missing dts in video streams 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-04 02:18:04 +01:00
Michael Niedermayer
394b0c830a avformat/utils: correct for timestamp wrap earlier 
This uses dts & pts as reference instead of first_dts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-04 02:18:04 +01:00
Michael Niedermayer
d7ead9ad44 avformat/utils: also fix wrapping of start_time in update_initial_timestamps() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-04 02:18:04 +01:00
Michael Niedermayer
dd5f925927 avformat/utils: Fix pts_wrap_behavior calculation with negative first_dts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-04 02:18:04 +01:00
Michael Niedermayer
b2c89453dc avformat/avisynth: remove duplicate av_new_packet() call 
Found-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-01 22:12:57 +01:00
Anton Khirnov
c46ab34d81 avisynth: make avs_library statically allocated. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-01 13:14:47 +01:00
Stephen Hutchinson
801c186440 avisynth: Move to av_new_packet/av_free_packet. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-01 13:14:42 +01:00
Carl Eugen Hoyos
2ccc6ff03a Add an Opus and a Speex muxer. 
Fixes ticket #3181.
 2013-12-01 12:03:34 +01:00
Carl Eugen Hoyos
4ba90392bc Support AC-3 in Sega Dreamcast Sofdec files. 
Fixes ticket #3184
 2013-12-01 12:02:21 +01:00
Anton Khirnov
95fd52c11b mxfdec: set extradata size 
The line setting it was mistakenly removed in
ecf442a58b
 2013-11-29 14:19:47 +01:00
Kostya Shishkov
a16577d985 MSN Audio support 
This is essentially a MS GSM decoder extension that supports more
sampling rates and lower bitrates.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-26 08:31:10 +01:00
Diego Biurrun
ab81f24ad4 build: Integrate multilibrary examples into the build system 
This includes moving libavformat/output-example to doc/examples/output.
 2013-11-25 11:57:29 -08:00
Stefano Sabatini
c0f2e07135 lavf/segment: add a few log messages when avio_open2() fails 2013-11-25 19:20:11 +01:00
Stefano Sabatini
5e278c19c7 lavf/segment: add segment_list_entry_prefix option 
This option allows to add a prefix to the segment list entry filenames.

Also set by default the list entry filenames to the corresponding
segment basename, consistent with the HLS muxer.

Based on an idea by Steven Liu <lingjiujianke@gmail.com>.
 2013-11-25 19:12:16 +01:00
Vignesh Venkatasubramanian
7f11c530dc lavf: Exporting opus pre_skip in AVCodecContext 
Opus Pre Skip is exported in AVCodecContext->delay similar to how
it is done for matroska. Doing the same for ogg too.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-25 15:29:49 +01:00
Michael Niedermayer
e78d038187 avformat/asfdec: ignore packet_segments 
Fixes Ticket1708
Based on patch by Alberto Delmás

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-24 20:33:26 +01:00
Alberto Delmás
edf7d15eb0 avformat/asfdec: reset packet_time_start when asf_read_frame_header() failed 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-24 20:33:26 +01:00
Michael Niedermayer
76dad833e9 avformat/asfdec: remove duplicated packet_segments reset 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-24 20:23:22 +01:00
Carl Eugen Hoyos
e043298cb1 lavf/mpegenc: Print a warning if ac3, pcm_s16be or dts are muxed into mpeg1. 
Some media players don't play the resulting files.
The warning should help users to avoid the issues described in ticket #1720.
 2013-11-24 10:37:52 +01:00
Michael Niedermayer
ccdfa3e271 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Add missing #includes for *INT64_MAX and *INT64_C

Conflicts:
	ffmpeg.c
	ffmpeg_filter.c
	ffplay.c
	libavformat/assdec.c
	libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-24 05:21:19 +01:00
Diego Biurrun
8f8bc92365 Add missing #includes for *INT64_MAX and *INT64_C 2013-11-23 21:55:52 +01:00
Michael Niedermayer
5c4aa72b75 avformat/hnm: check chunk_size == 0 
Fixes potential infinite loop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 23:52:08 +01:00
Michael Niedermayer
a7f27453f6 avformat/mov: Check that we have a stream before accessing it in mov_read_ares() 
Fixes out of array read
Fixes: signal_sigsegv_6f1855_3910_avid_test_alpha.mov

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 22:04:03 +01:00
Michael Niedermayer
2e97e24409 avformat/ipmovie: check OPCODE_INIT_VIDEO_BUFFERS size more completely 
Fixes use of uninitialized data

Fixes: signal_sigsegv_1571228_5930_ipmovie_interplayvideo_interplay_dpcm__bislogo.mve

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 19:49:25 +01:00
Michael Niedermayer
9c00f9ada6 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  hls: Avoid reading outside of the allocated array

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 18:15:12 +01:00
Michael Niedermayer
9440e47067 Merge commit '8c929098141ebc94ad3f303521c520bb3dc6d8f6' 
* commit '8c929098141ebc94ad3f303521c520bb3dc6d8f6':
  hls: Check whether the AVIOContext contains a new redirected URL

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 18:08:53 +01:00
Michael Niedermayer
15b2ec57cc Merge commit 'be4edda6731a341d3fdeaa0e57753dc396790362' 
* commit 'be4edda6731a341d3fdeaa0e57753dc396790362':
  http: Expose the content location via an AVOption

Conflicts:
	libavformat/http.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 17:48:45 +01:00
Michael Niedermayer
1d19f1b196 Merge commit '393d80cc278e2b2f5c9e7805db176e6f28335a33' 
* commit '393d80cc278e2b2f5c9e7805db176e6f28335a33':
  http: Support relative URL redirection

Conflicts:
	libavformat/http.c

See: 4a4c93cb3f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 17:41:45 +01:00
Michael Niedermayer
6d648dcfc9 Merge commit '76267ecc82e3018e1913a2483d5fc47d0949cbd8' 
* commit '76267ecc82e3018e1913a2483d5fc47d0949cbd8':
  http: Remove an unrelated and mistakenly set AVOption unit name

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 17:18:52 +01:00
Michael Niedermayer
7865759409 avformat/avidec: Dont assert the existence of an index for video streams. 
Its possible in various rare cases that an index cannot be created or allocated.
Fixes assertion failure
Fixes: signal_sigabrt_7ffff7126425_7712_pokem.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 17:02:00 +01:00
Martin Storsjö
56c2337004 hls: Avoid reading outside of the allocated array 
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-11-22 14:27:10 +02:00
Martin Storsjö
8c92909814 hls: Check whether the AVIOContext contains a new redirected URL 
This allows both the main playlist itself as well as the variant
playlists to handle redirects combined with relative URLs.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-11-22 14:27:08 +02:00
Martin Storsjö
be4edda673 http: Expose the content location via an AVOption 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-11-22 14:27:07 +02:00
Zhang Rui
393d80cc27 http: Support relative URL redirection 
In RFC 2616, this was explicitly said to be an absolute URL,
while in an upcoming draft [1] it is allowed to be relative as well.

[1] http://tools.ietf.org/html/draft-ietf-httpbis-p2-semantics-25#section-7.1.2

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-11-22 14:27:04 +02:00
Martin Storsjö
76267ecc82 http: Remove an unrelated and mistakenly set AVOption unit name 
This was due to a copypaste oversight.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-11-22 14:27:01 +02:00
Michael Niedermayer
9cbe834dfd avformat/avidec: Skip duplicate strf chunks 
Fixes Ticket3119

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 02:06:03 +01:00
Michael Niedermayer
7c98c834e0 avformat/avidec: also print position in print_tag() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 01:29:02 +01:00
Anton Khirnov
ce9bba5340 avidec: fix a memleak in the dv init code. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
 2013-11-21 20:57:58 +01:00
Aurelien Jacobs
8b516f154a matroskadec: use correct compression parameters for current track CodecPrivate 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-21 20:54:55 +01:00
Anton Khirnov
30be1ea33e matroskadec: pad EBML_BIN data. 
It might be passed to code requiring padding, such as lzo decompression.

Fixes invalid reads.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
 2013-11-21 20:54:30 +01:00
Michael Niedermayer
f0f75dfa34 avformat/utils: inject audio skip side data before the side data merge code 
This ensures that its handled the same way as other side data

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-21 03:21:23 +01:00
Michael Niedermayer
98fc81b20d avformat/utils: move side data merge after parser 
merging before the parser can conflict with the parser, also
future changes depend on it being done later

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-21 01:02:11 +01:00
Compn
ef7f751642 riff: add DYM4 mpeg4 fourcc 2013-11-19 14:24:25 -05:00
Clément Bœsch
722fb81dc5 avformat/jacosubdec: make probing less tolerant. 
Fixes a failure with probetest:
  ./tools/probetest 8192 500000
  [...]
  Failure of jacosub probing code with score=51 type=1 p=CAB size=16

Random data was:
  00000000  40 37 40 30 93 01 48 e0 09 96 10 90 78 0f 0c 10 @7@0..H.....x...
 2013-11-19 12:53:20 +01:00
Michael Niedermayer
7d0e927a31 avformat/mpegts: fix resync seek 
The seek ended up seeking before the begin, which caused problems
Fixes initial sync issues with libbluray
Fixes Ticket3117

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-18 16:38:12 +01:00
Michael Niedermayer
cbefb3d909 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rtmphttp: Check for both 0 and AVERROR_EOF

Conflicts:
	libavformat/rtmphttp.c

See: d04b7de786
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-18 16:02:50 +01:00
Valeriy Argunov
cc20fbcd39 rtmphttp: Check for both 0 and AVERROR_EOF 
This makes RTMPT work again - it was broken by 5d876be87a.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-11-18 12:36:32 +02:00
Michael Niedermayer
a8dec360c5 avformat/utils: dont count attached pics toward the probesize 
Such pics behave more like headers which we also dont count.
Fixes Ticket3146

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-18 03:02:36 +01:00
Michael Niedermayer
0ee905e243 Merge commit '5b9c3b4505206143d85398c1410949319fa1180f' 
* commit '5b9c3b4505206143d85398c1410949319fa1180f':
  Replace all instances of avcodec_alloc_frame() with av_frame_alloc().

Conflicts:
	doc/examples/decoding_encoding.c
	doc/examples/muxing.c
	ffmpeg.c
	libavcodec/alacenc.c
	libavcodec/libopenjpegenc.c
	libavcodec/libvpxenc.c
	libavcodec/pcm.c
	libavcodec/xbmenc.c
	libavcodec/xwdenc.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-16 23:54:10 +01:00
Anton Khirnov
5b9c3b4505 Replace all instances of avcodec_alloc_frame() with av_frame_alloc(). 2013-11-16 12:44:20 +01:00
Byte
d04b7de786 avformat/rtmphttp: Partial fix for the ticket #3127 (second try) 
Reviewed-by: Lukasz M <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-16 02:45:58 +01:00
Jan Gerber
8cc59ec881 lavf/matroskadec ReferenceBlock is a signed integer 
according to the Matroska Specification
ReferenceBlock is a signed integer too.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-16 01:24:40 +01:00
Jan Gerber
f4b1ca99ff lavf/matroska*: DiscardPadding is a signed integer 
according to the Matriska Specification
 http://matroska.org/technical/specs/index.html
DiscardPadding is a signed integer.

Tested-by: Jan Gerber <j@v2v.cc>
Tested-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-16 00:49:23 +01:00
Michael Niedermayer
cddd15ba5c avformat/matroska: simplify signed int access code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-15 21:38:23 +01:00
Jan Gerber
d03eea36b2 lavf/matroska*: add support for signed integers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-15 21:38:12 +01:00
Compn
5592d1b741 riff: add G264 to mpeg4, only decodes keyframes 2013-11-15 09:46:35 -05:00
Michael Niedermayer
e28130bcaf Merge commit '3cbe1126530449336e2ce59b194bdb8c4eb4abb4' 
* commit '3cbe1126530449336e2ce59b194bdb8c4eb4abb4':
  dv: Split DV data table declarations into their own header

Conflicts:
	libavcodec/dvdata.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-15 12:52:19 +01:00
Diego Biurrun
3cbe112653 dv: Split DV data table declarations into their own header 
This is necessary to avoid target config settings bleeding into the host
compilation process with hardcoded tables and the DV VLC tables no longer
present as static tables in a header file.
 2013-11-15 01:29:47 +01:00
Michael Niedermayer
074bae745d Merge commit 'ecf442a58b09bdb1dc1d2c3904b82ac5f79b2878' 
* commit 'ecf442a58b09bdb1dc1d2c3904b82ac5f79b2878':
  lavf: improve support for AVC-Intra files.

Conflicts:
	libavformat/internal.h
	libavformat/isom.c
	libavformat/mxfdec.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-14 21:04:44 +01:00
Reimar Döffinger
ecf442a58b lavf: improve support for AVC-Intra files. 
Generate extradata with SPS/PPS based on container dimensions.

Authors of this commit are: Reimar and Thomas Mundt

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-14 18:59:39 +01:00
Marton Balint
951d819006 mxfdec: update current edit unit when seeking in mxf files without index tables 
Fixes audio packet pts values in some files generated by AVID TRMG 3.01.

Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-14 18:59:17 +01:00
Michael Niedermayer
4abe6e4153 avformat/nullenc: mark null as VFPS 
This avoids frame duplication for null output
avoiding unneeded computations.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-13 22:56:18 +01:00
Michael Niedermayer
269f5d902a avformat/aviobuf: return error from avio_put_str16le() for invalid input 
Found-by: Stefano Sabatini
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-13 19:16:27 +01:00
Michael Niedermayer
b52ae27edf avio_put_str16le: Print error message in case of invalid UTF8 input 
Found-by: Stefano Sabatini
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-13 19:09:04 +01:00
Michael Niedermayer
7561974dfe avformat/mmst: propagate error code from avio_put_str16le() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-13 18:04:11 +01:00
Michael Niedermayer
e3fc4481b6 avformat/vqf: check a few more bits in probe 
Fixes probetest failure
The threshold is choosen so that a all printale ascii string will never be
detected as vqf

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-13 01:36:09 +01:00
Michael Niedermayer
0062869ae2 avformat/smacker: check width/height in probe 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-12 19:37:37 +01:00
Michael Niedermayer
f9b89b61f8 avformat/electronicarts: check chunksize more completely in probe() 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-11 21:31:56 +01:00
Michael Niedermayer
20769d9349 avformat/electronicarts: check chunk size. 
Fix infinite loop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-11 19:51:12 +01:00
Michael Niedermayer
bdab2421a5 avformat/dfa: check first frame offset in probe 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-11 19:38:38 +01:00
Michael Niedermayer
f66f3819b9 avformat/bethsoftvid: check 4th header byte in probe 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-11 17:50:51 +01:00
Michael Niedermayer
650fd9c004 avformat/avr: check channels and bps in probe 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-11 14:51:43 +01:00
Michael Niedermayer
676bc505f7 avformat/utils: disabled debug code to collect format probing statistics 
This allows collecting statistics on probing scores and the amount of data
probing needed for various files and formats.
For example it can be used to find out which formats tend to need more
data for probing or which files are probed with less certain/lower scores

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-11 13:06:36 +01:00
Michael Niedermayer
2fbc759d08 avformat/diracdec: check 2 chunks in probe 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 16:06:16 +01:00
Michael Niedermayer
023953e964 avformat/astdec: increase the score for odd samplerate/channels to max/8 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 13:37:06 +01:00
Michael Niedermayer
eb96802355 avformat/rsd: increase the score for odd samplerate/channels to max/8 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 13:37:03 +01:00
Michael Niedermayer
ef28694d36 avformat/lvfdec: increase the score for odd channels to max/8 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 13:36:59 +01:00
Michael Niedermayer
9225ebd50d avformat/swfdec: return AVPROBE_SCORE_MAX / 4 for unexpected versions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 13:25:35 +01:00
Michael Niedermayer
b570835296 avformat/ape: check version in probe 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 13:25:35 +01:00
Michael Niedermayer
59ce62f713 avformat/dv: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 12:27:17 +01:00
Michael Niedermayer
52268def10 avformat/thp: check fps value during probing 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 02:04:08 +01:00
Michael Niedermayer
858ef56297 avformat/thp: do not set sample_rate for a video codec 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 02:04:08 +01:00
Erik Olofsson
f5bffd3a1a libavf/avienc: store language metadata for XSUB streams 
Formatted in such a way that DivX certified players can decode it.
Verified on Sony Playstation 3 and Philips DVP3380.

Fixes ticket 2385

Signed-off-by: Erik Olofsson <eaj.olofsson@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-09 20:33:04 +01:00
Michael Niedermayer
ef8f293472 avformat/dv: consider a header match at byte 0 to count as detection of dv in probe 
This reduces the amount of data needed to identify dv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-09 18:39:09 +01:00
Michael Niedermayer
e624df5dc3 mpegts: only calculate stat index when its needed during probe 
40% faster probe

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-09 16:09:26 +01:00
Michael Niedermayer
9825b99eca avformat/mpegts: do not hardcode type used in memset() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-09 16:03:41 +01:00
Michael Niedermayer
76a47d66c4 avformat/dv: about 3 times faster probe 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-09 14:46:14 +01:00
James Zern
eb7f7b797f riff: add VP9 fourcc 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-09 12:13:44 +01:00
Michael Niedermayer
64f4816915 avformat/mp3dec: 4x faster probing 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-09 01:45:24 +01:00
Michael Niedermayer
557571ff7d avformat/h261dec: dont accept invalid gobs in probe as valid 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-09 01:12:10 +01:00
Michael Niedermayer
891f33cc70 avformat/h261dec: optimize probe 
about 3 times faster

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-09 00:45:35 +01:00
Michael Niedermayer
c79c7ffc9d Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avienc: drop the vfr flag.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-09 00:18:50 +01:00
Michael Niedermayer
a26e83da6c avformat/mxfdec: optimize probing 
about 71 times faster

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-08 22:33:52 +01:00
Anton Khirnov
d42db44cfe avienc: drop the vfr flag. 
AVI does not really support vfr properly, only by padding with null
packets.
 2013-11-08 21:02:29 +01:00
Michael Niedermayer
4f0e85517f avformat/icodec: reduce score returned on probing 
The ico probe function is pretty weak just checking a few bytes for being 0, 1 or not 0

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-08 20:10:33 +01:00
Michael Niedermayer
f8a9cf7704 avformat/lvfdec: check stream count during probing 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-08 17:03:42 +01:00
Michael Niedermayer
4c439f6e39 avformat/idcin: check the decompressed frame size during probing 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-08 15:19:35 +01:00
Hendrik Leppkes
019247bdc3 avformat/mov: only force parsing for video tracks if stss is empty 
Fixes playback of some AAC streams, which are otherwise mangled by the
parser, and stss is typically only valid for video anyway.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-08 11:31:02 +01:00
Michael Niedermayer
3836af4765 avformat/mpegvideodec: check seq headers more completely during probing 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-07 20:39:08 +01:00
Clément Bœsch
3bcd5c1e31 avformat/img2enc: simplify split planes extension selection. 2013-11-07 20:30:43 +01:00
Clément Bœsch
c37b0daf33 avformat/gif: fix final_delay unit in documentation. 2013-11-07 20:30:43 +01:00
Clément Bœsch
3c5e6e7635 avformat/img2enc: reindent after previous commit. 2013-11-07 20:30:43 +01:00
Clément Bœsch
f70db22999 avformat/image2: allow muxing gif files. 
Fixes Ticket #2936.
 2013-11-07 20:30:43 +01:00
Michael Niedermayer
cbe84b4ffa avformat/astdec: sanity check channels & sample rate 
Fixes probetest failure

Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-07 14:58:34 +01:00
kowalsky
4684539c91 avformat/hls: fixed bug where custom http headers weren't kept for hls streams 
See: https://trac.ffmpeg.org/ticket/3024
 2013-11-07 12:29:45 +01:00
Michael Niedermayer
3e6b7bbce5 avformat/segafilm: check 2nd tag 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-06 12:56:42 +01:00
Michael Niedermayer
ff1d81b08c avformat/swfdec: check version and size during probing 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-06 12:44:02 +01:00
Michael Niedermayer
7b7697646b avformat/rsd: increase probe score, as misdetections are fixed 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-06 11:57:57 +01:00
Michael Niedermayer
50a3c4c5d2 avformat/rsd: Check channels and sample_rate fields 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-06 11:57:57 +01:00
Michael Niedermayer
a35e30b672 avformat/libgme: decrease score by 1, fixes probetest failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-06 11:57:48 +01:00
Michael Niedermayer
04047b6166 avformat/http: print http headers at AV_LOG_DEBUG level 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-05 01:38:08 +01:00
Michael Niedermayer
bd75651378 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  omadec: loosen format probing constraints

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-04 22:46:22 +01:00
Michael Niedermayer
aeaca3816c Merge commit '1c736bedd9891501960ebac0f7c05eb60225e947' 
* commit '1c736bedd9891501960ebac0f7c05eb60225e947':
  omadec: check GEOB sizes against buffer size

Conflicts:
	libavformat/omadec.c

See: e74fa25cb9
See: 91e72e3514
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-04 22:08:59 +01:00
David Goldwich
0a7fef39fc omadec: loosen format probing constraints 
Imporoves detection of some files in the wild:

- ID3v2 a.k.a. "ea3" header is optional.
- Version and flags in ID3v2 header are unspecified.

Signed-off-by: David Goldwich <david.goldwich@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-04 18:43:18 +01:00
Michael Niedermayer
1c736bedd9 omadec: check GEOB sizes against buffer size 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: David Goldwich <david.goldwich@gmail.com>
CC:libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-04 18:43:03 +01:00
Michael Niedermayer
97f50e92b5 omadec: Fix wrong number of array elements 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: David Goldwich <david.goldwich@gmail.com>
CC:libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-04 18:38:01 +01:00
wm4
3220a894f7 http: add hack to make streams served by MediaGateway not seekable 
These streams are reported as seekable, but all tests show they are not,
and the server merely pretends the streams are seekable. The server
responds with:

    content-range: bytes 0-1999999999/2000000000

Range requests seem to be correctly answered, but the actual data
returned at the same offset is different. Assume this is a bug in the
server software. The server identifies itself as:

    Server: MediaGateway 3.5.2-001

Add a hack that checks the server name, and disables seeking in this
case.

Test URL: http://8283.live.streamtheworld.com:80/CBC_R1_VCR_H_SC

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-03 22:57:56 +01:00
Michael Niedermayer
8b73a3f6f6 avformat/utils: never decrease has_b_frames in compute_pkt_fields() 
The intent of the original check was to increase has_b_frames when
it was incorrectly set to 0. Later codecs allowed larger values

Found-by: divVerent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-03 21:36:10 +01:00
Michael Niedermayer
2ed562d5fa Merge remote-tracking branch 'cigaes/master' 
* cigaes/master:
  lavfi/af_pan: support unknown layouts on input.
  lavfi/af_pan: support unknown layouts on output.
  lswr: fix assert failure on unknown layouts.
  lavfi: parsing helper for unknown channel layouts.
  lavfi/avfiltergraph: do not reduce incompatible lists.
  lavfi/avfiltergraph: suggest a solution when format selection fails.
  lavd/lavfi: support unknown channel layouts.
  lavf/wavenc: check for a single stream.
  lavd/alsa: add stream validation
  lavd/alsa: fix timestamp calculation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-03 13:57:05 +01:00
Michael Niedermayer
b6413cdc02 Merge commit 'c0bba95c2363641d3297b3852b2ece1474cda295' 
* commit 'c0bba95c2363641d3297b3852b2ece1474cda295':
  wtv: fix variable sign in format

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-03 12:48:28 +01:00
Vittorio Giovara
d763978583 rtmpproto: Reorder conditions to help dead code elimination 
This makes sure that these branches are eliminated properly
with clang with optimizations disabled.
 2013-11-03 11:51:41 +01:00
Vittorio Giovara
c0bba95c23 wtv: fix variable sign in format 2013-11-03 11:51:40 +01:00
Nicolas George
eeb975f5cd lavf/wavenc: check for a single stream. 
Fix trac ticket #3110.
 2013-11-03 10:29:27 +01:00
Michael Niedermayer
67d1d06225 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  os_support: Add #endif comments for better readability

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 18:37:21 +01:00
Diego Biurrun
5928b29f53 os_support: Add #endif comments for better readability 2013-11-02 13:57:03 +01:00
Michael Niedermayer
641358addc Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Add an HDS live fragmenting muxer

Conflicts:
	Changelog
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 10:38:03 +01:00
Martin Storsjö
435214a757 Add an HDS live fragmenting muxer 
HDS fragments basically are FLV fragments wrapped in an ISO
media mdat atom.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-11-02 10:51:00 +02:00
Anton Khirnov
d1c229cdbc lavf: do not use int to store an int64 2013-11-01 21:01:32 +01:00
Mark Himsley
8b3964ecd1 avformat/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>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 19:46:02 +01:00
Michael Niedermayer
1295377f0a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rtspenc: Make sure BYE packets are sent before TEARDOWN

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 19:40:20 +01:00
Michael Niedermayer
04894ef32e Merge commit '9ceed7af377cea6a430d63a2f5d5cf1afe0d4f05' 
* commit '9ceed7af377cea6a430d63a2f5d5cf1afe0d4f05':
  rtpenc: Add a rtpflag option for sending BYE packets when finishing

Conflicts:
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 19:34:19 +01:00
Michael Niedermayer
5a7a56d7be Merge commit 'b264453de93999ea6f23e98014390af468f56146' 
* commit 'b264453de93999ea6f23e98014390af468f56146':
  rtpenc: Remove some superfluous parentheses

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 19:33:16 +01:00
Michael Niedermayer
81c3bb78ac Merge commit 'd07b51bf0733fe58bbfa13c448775dc325463cb4' 
* commit 'd07b51bf0733fe58bbfa13c448775dc325463cb4':
  aviobuf: Handle a NULL buffer in avio_close_dyn_buf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 19:28:39 +01:00
Michael Niedermayer
6262763d8d Merge commit 'b6a4701612514c97d22f7ffb37993539f7718352' 
* commit 'b6a4701612514c97d22f7ffb37993539f7718352':
  mpegts: Support HEVC demuxing

Conflicts:
	Changelog
	libavformat/version.h

See: 93c1fe4de3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 18:05:25 +01:00
Michael Niedermayer
0fbeeb9399 Merge commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075' 
* commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075':
  matroskadec: Support HEVC demuxing

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

See: 16b6839de6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 17:57:57 +01:00
Michael Niedermayer
3a0c902636 Merge commit 'ea29f965dc71182f77b8efe819630f55e48b0ab7' 
* commit 'ea29f965dc71182f77b8efe819630f55e48b0ab7':
  mov: Support HEVC demuxing

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

See: 53f903b7c5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 17:42:10 +01:00
Michael Niedermayer
b594aceb94 Merge commit '5846646296e377e093441dfe9eadde38ff1f7c99' 
* commit '5846646296e377e093441dfe9eadde38ff1f7c99':
  Add raw HEVC demuxer

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

See: 902a5fa722 and later commits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 17:33:05 +01:00
Michael Niedermayer
51c5768cca Merge commit 'ce6949d3a0607eb318dc2872553110df934e9720' 
* commit 'ce6949d3a0607eb318dc2872553110df934e9720':
  oggparsetheora: stop using deprecated avcodec_set_dimensions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 13:15:21 +01:00
Michael Niedermayer
a2bfee36b7 Merge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e' 
* commit '9af7a8523a6bb517834ebed36093bdab11a8b38e':
  HNM4/HNM4A demuxer & video decoder

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/version.h
	libavformat/Makefile
	libavformat/allformats.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 10:46:39 +01:00
Martin Storsjö
50aef03b24 rtspenc: Make sure BYE packets are sent before TEARDOWN 
Also make sure the BYE packets are sent at all when using
TCP interleaved transport.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-11-01 09:57:06 +02:00
Martin Storsjö
9ceed7af37 rtpenc: Add a rtpflag option for sending BYE packets when finishing 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-11-01 09:57:02 +02:00
Martin Storsjö
b264453de9 rtpenc: Remove some superfluous parentheses 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-11-01 09:56:28 +02:00
Martin Storsjö
d07b51bf07 aviobuf: Handle a NULL buffer in avio_close_dyn_buf 
This simplifies proper error handling in rtsp.c/rtspdec.c. When
broadcasting over RTSP in TCP mode, the AVIOContext is closed and
recreated for each sent packet, and if the recreation fails, we might
try to close a NULL buffer when freeing things at the end.

Previously, if recreating the buffer in rtspdec.c failed, this would
crash later due to trying to close a NULL buffer.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-11-01 09:56:27 +02:00
Mickaël Raulet
b6a4701612 mpegts: Support HEVC demuxing 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-10-31 20:20:57 +01:00
Yusuke Nakamura
959bea13ce matroskadec: Support HEVC demuxing 2013-10-31 20:20:49 +01:00
Yusuke Nakamura
ea29f965dc mov: Support HEVC demuxing 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-10-31 20:20:32 +01:00