RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
48,454 Commits 36 Branches 398 Tags 226 MiB
Commit Graph

12058 Commits

Author SHA1 Message Date
Michael Niedermayer d7e050b11d adts_aac_probe: mark buffer pointers as const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:41:00 +01:00
Michael Niedermayer ec40d15d82 oggdec: fix warning: assignment discards qualifiers from pointer target type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-24 22:37:24 +01:00
Michael Niedermayer 70d5cd103a mcdec: suppress "warning: a/vst may be used uninitialized in this function" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-24 18:31:37 +01:00
Michael Niedermayer e9c4f36c52 lavf/mpeg: suppress warning: lpcm_header_len may be used uninitialized in this function 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-24 18:18:03 +01:00
Michael Niedermayer d69238e991 Merge commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a' 
* commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a':
  Return proper error code after av_log_ask_for_sample()
  configure: cosmetics: Separate hwaccel dependencies from decoders/encoders
  oggdec: check memory allocation

Conflicts:
	configure
	libavcodec/pictordec.c
	libavformat/anm.c
	libavformat/oggdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-24 15:09:58 +01:00
Michael Niedermayer c6664242e0 Merge commit 'f5f1cf52240759208b42477e2157a7b4409ade10' 
* commit 'f5f1cf52240759208b42477e2157a7b4409ade10':
  oggdec: K&R cosmetic formatting
  hlsenc: correctly report target duration

Conflicts:
	libavformat/oggdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-24 14:43:03 +01:00
Michael Niedermayer d4d8d4f786 rl2: return EOF on EOF 
Fixes Ticket1947

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-24 02:51:51 +01:00
Martin Storsjö 4a9f7d2bf9 hlsenc: Don't duplicate a string constant 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-24 00:02:48 +02:00
Stefano Sabatini 3193b13aa1 hlsenc: Allocate enough space for the pattern string 
If s->filename doesn't contain any period/filename extension to strip
away, the buffer will be too small to fit both strings. This isn't
any buffer overflow since the concatenation uses av_strlcat with
the right buffer size.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-24 00:02:45 +02:00
Paul B Mahol 4f5440adc2 NIST SPHERE demuxer 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-23 21:22:43 +00:00
Diego Biurrun f3298f1299 Return proper error code after av_log_ask_for_sample() 2012-12-23 18:56:56 +01:00
Piotr Bandurski 9bbfcc2675 rmenc: write correct bytes per minute 
improves playback of ac3 in RealPlayer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-23 16:08:10 +01:00
Piotr Bandurski 76f126ba2e rmdec: set bit rate for ra3 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-23 15:59:41 +01:00
Luca Barbato ba064ebe48 oggdec: check memory allocation 2012-12-23 12:19:15 +01:00
Luca Barbato f5f1cf5224 oggdec: K&R cosmetic formatting 2012-12-23 12:19:08 +01:00
Luca Barbato 7e98956e72 hlsenc: correctly report target duration 2012-12-23 12:13:41 +01:00
James Darnley 707af43d19 lavf/y4m: spellcheck 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-23 01:01:17 +01:00
Piotr Bandurski 2e6bd22bbf rmdec: set bit rate for ra4 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-23 00:10:49 +01:00
Stefano Sabatini 60c801c679 lavf/hlsenc: reuse pattern string, rather than redefining it 
Improve robustness.
 2012-12-22 22:02:06 +01:00
Stefano Sabatini 005b360b9c lavf/hlsenc: fix basename size computation off-by-one bug 2012-12-22 22:02:06 +01:00
Michael Niedermayer 165be91c2b img2enc: fix typo 
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-21 22:56:13 +01:00
rogerdpack d828bae9d2 better failure message for img2enc 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-21 21:18:12 +01:00
Piotr Bandurski 0e3a4da106 yop: set video bit rate 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-21 21:18:12 +01:00
Michael Niedermayer 1b598e6776 Merge commit 'c7d4de3d730473167e31cf765e0333c965f934d3' 
* commit 'c7d4de3d730473167e31cf765e0333c965f934d3':
  rtpdec_vp8: Don't return known-broken packets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-21 17:51:31 +01:00
Michael Niedermayer bb3420d88e Merge commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59' 
* commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59':
  rtpdec: Pass the sequence number to depacketizers
  configure: Make avconv depend on null, anull and resample filters

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-21 17:46:43 +01:00
Michael Niedermayer d27edc038a Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3' 
* commit '511cf612ac979f536fd65e14603a87ca5ad435f3':
  miscellaneous typo fixes

Conflicts:
	libavcodec/4xm.c
	libavcodec/lagarith.c
	libavcodec/parser.c
	libavcodec/ratecontrol.c
	libavcodec/shorten.c
	libavcodec/vda_h264.c
	libavformat/dvenc.c
	libavformat/wtv.c
	tools/patcheck

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-21 17:32:52 +01:00
Michael Niedermayer 29707f5ba6 Merge commit 'a925f723a915bc0255e2673f8817af5212131763' 
* commit 'a925f723a915bc0255e2673f8817af5212131763':
  rtp: Don't read priv_data unless it is allocated
  flvenc: Check whether seeking back to the header succeeded
  sapenc: Pass the title on to the chained muxers

Conflicts:
	libavformat/flvenc.c
	libavformat/sapenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-21 14:06:42 +01:00
Martin Storsjö c7d4de3d73 rtpdec_vp8: Don't return known-broken packets 
This is built on the assumption that the first partition of each
VP8 packet is essential for decoding any later packet - if this
partition is broken/missed, the arithmetic coder gets out of sync
and decoding the bitstream in further packet ends up with total
garbage. If packets of a frame are lost, make sure the first
partition is intact (return only this part of the packet, nothing
else), otherwise stop returning data until the next keyframe is
received.

Alternatively, one would simply not return any packets at all
until the next keyframe, if packet loss is detected.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-21 14:14:47 +02:00
Martin Storsjö 90c784cc13 rtpdec: Pass the sequence number to depacketizers 
This allows depacketizers to figure out if packets have been lost.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-21 14:14:40 +02:00
Michael Niedermayer 63753186cc lavf: Remove "Adjusting PTS forward" code 
it causes problems (incorrectly detect TS discontinuities)
 with a brokan TS file (test-audio-broken.ts)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-21 05:12:05 +01:00
Carl Eugen Hoyos 9eca649a92 Fix compilation with --disable-everything --enable-muxer=mov. 2012-12-21 00:27:34 +01:00
Diego Biurrun 511cf612ac miscellaneous typo fixes 2012-12-21 00:18:34 +01:00
Stefano Sabatini 340b7caf54 lavf/hlsenc: provide some feedback in case of invalid basename 2012-12-21 00:07:21 +01:00
Stefano Sabatini 28b96efab5 lavf/hlsenc: fix minor grammar inconsistencies in the option help messages 2012-12-21 00:07:13 +01:00
Clément Bœsch 217bdd08e3 lavf/srtdec: reindent after previous commits. 2012-12-20 16:13:53 +01:00
Clément Bœsch 6c26fc7704 lavf/srtenc: honor subtitle position side data. 2012-12-20 16:13:52 +01:00
Clément Bœsch 1dab8d9157 lavf/srtdec: switch to FFDemuxSubtitlesQueue API. 2012-12-20 16:13:52 +01:00
Clément Bœsch 0072116ccb lavf: split packets before muxing. 
After demuxing, data and side are merged. Before decoding, they are
split. Encoder will perform with data and side split. This means that a
muxer can receive split data (after encoding) but also merged data (if
called directly after demuxing). This commit makes sure data and side
are split for the muxer.
 2012-12-20 16:13:52 +01:00
Piotr Bandurski 52f2176366 aiffenc: set correct number of bits foru8 in aiff 
with this change QuickTime is able to play u8 aiff file generated by FFmpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-20 16:05:30 +01:00
Martin Storsjö a925f723a9 rtp: Don't read priv_data unless it is allocated 
This makes all users of rtpenc_chain (rtsp muxer, sapenc, mov
rtp hinting) work again, broken since 8034130e0.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-20 14:25:49 +02:00
Michael Niedermayer 40ea343866 Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011' 
* commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011':
  cmdutils: pass number of groups to split_commandline().
  mov: handle h263 and flv1 for codec_tag 'H','2','6','3'
  h264: fix sps parsing for SVC and CAVLC 4:4:4 Intra profiles

Conflicts:
	libavcodec/h264_ps.c
	libavformat/isom.c
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-20 12:06:15 +01:00
Björn Axelsson 1eaff98c83 flvenc: Check whether seeking back to the header succeeded 
The FLV muxer tries to update the header in write_trailer, which is
impossible if writing to a pipe or network stream. Don't write header
data if seeking to the header fails.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-20 12:37:42 +02:00
Jernej Virag e30e8e311e sapenc: Pass the title on to the chained muxers 
This makes sure it ends up in the SDP, providing a proper session name
in the SAP announcements.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-20 12:37:34 +02:00
James Almer 974ac57e83 astenc: Remove two AVRationals with denominator 1 
They are completely superfluous when using av_rescale_q_rnd().
Call av_rescale_rnd() using what used to be the numerators instead.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-20 05:05:55 +01:00
Paul B Mahol 76877beada au: return meaningful error codes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-19 20:16:35 +00:00
Paul B Mahol d85854b269 pvfdec: drop pointless casting of buffer in ff_get_line() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-19 15:55:39 +00:00
Janne Grunau bb2bab92e7 mov: handle h263 and flv1 for codec_tag 'H','2','6','3' 
The sample in https://bugzilla.libav.org/show_bug.cgi?id=393 and
samples/F4V/H263_NM_f.mp4 both have codec_tag H263 for different
codecs. H263 is apparently used by Flash Media Server for Sorensen
Spark videos.

Patch based on commit 5442083b1c by
Carl Eugen Hoyos. Fixes bug 393.
 2012-12-19 14:50:14 +01:00
Michael Niedermayer af804dbe9e Merge commit '523c7bd23c781aa0f3a85044896f5e18e8b52534' 
* commit '523c7bd23c781aa0f3a85044896f5e18e8b52534':
  misc typo, style and wording fixes

Conflicts:
	libavcodec/options_table.h
	libavutil/pixfmt.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-19 14:28:58 +01:00
Michael Niedermayer 1166fc07a2 utils: fix duration calculation for strange_duration_example.ts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-19 04:16:15 +01:00
Carl Eugen Hoyos d687b8c875 Cosmetics: Reindent after last commit. 2012-12-18 23:06:00 +01:00
Carl Eugen Hoyos 00a62e6776 Do not skip three bytes and don't search for extradata in old realaudio files. 
Fixes ticket #1557.
 2012-12-18 23:04:19 +01:00
Michael Niedermayer 94ecbe23c5 Merge commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a' 
* commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a':
  au: Reorder code so that both muxer and demuxer are under #ifdefs
  fate: Move RALF test into lossless audio group
  cosmetics: Use consistent names for multiple inclusion guards.

Conflicts:
	libavformat/au.c
	tests/fate/lossless-audio.mak
	tests/fate/real.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-18 14:27:59 +01:00
Peter Ross 95015634f5 wtv: permit root table and first sectors to be located beyond 2GB boundary 
Fixes ticket #2025.

Signed-off-by: Peter Ross <pross@xvid.org>
 2012-12-19 00:18:17 +11:00
Michael Niedermayer ebfb738fa4 nutdec: sanity check r_frame_rate 
This fixes files that store a somewhat incorrect value.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-18 14:03:04 +01:00
Diego Biurrun 523c7bd23c misc typo, style and wording fixes 2012-12-18 13:36:51 +01:00
Clément Bœsch 8b63744f48 Fix "bistream" typo and add a check in tools/patcheck. 2012-12-18 02:47:34 +01:00
Michael Niedermayer 1d29624c73 oggparsevorbis: check channels 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-17 20:51:50 +01:00
Jernej Virag 2f7465b5bf SAP muxer set session name from metadata 
Pass "title" metadata field to av_sdp_create (as in RTP muxer) in SAP
muxer for correct
session name in SAP SDP announcements.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-17 17:31:55 +01:00
Michael Niedermayer 8976ef7aec concatdec: change data type to suppress warning about limited range of data type on some platforms. 
Reviewed-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-17 17:31:34 +01:00
Derek Buitenhuis 26e4f0c70f doxy: Clarify what avpriv_set_pts_info does 
The "pts for a given stream" was nonsensical.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-12-17 11:20:00 -05:00
Derek Buitenhuis df0d6735b3 doxy: Clarify what avpriv_set_pts_info does 
The "pts for a given stream" was nonsensical.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-12-17 11:18:27 -05:00
Diego Biurrun c35f0e8495 au: Reorder code so that both muxer and demuxer are under #ifdefs 
This reduces code size when either piece has been disabled.
 2012-12-17 17:02:22 +01:00
Diego Biurrun 81c7c817a4 cosmetics: Use consistent names for multiple inclusion guards. 2012-12-17 17:02:22 +01:00
Michael Niedermayer 8d07bbca63 Merge commit 'f322b2073581119de5da74f92a03309a36891cfa' 
* commit 'f322b2073581119de5da74f92a03309a36891cfa':
  lavr: only save/restore the mixing matrix if mixing is being done
  rtpdec_vp8: Cosmetics: Fix bad alignment/indentation
  rtpenc: Allow including a SDES/CNAME block in RTCP SR packets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-17 14:06:11 +01:00
Michael Niedermayer 021b3497e1 Merge commit '65e053271a98f7acf3ef6b412998cfcb44a8eef8' 
* commit '65e053271a98f7acf3ef6b412998cfcb44a8eef8':
  rtpenc_vp8: Include the picture number in VP8 packets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-17 13:46:54 +01:00
Piotr Bandurski 0f450ac575 siff: set duration 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-17 13:34:30 +01:00
Peter Ross fb9d58509c isom: support SGI RLE 8-bit in QuickTime file format 
Signed-off-by: Peter Ross <pross@xvid.org>
 2012-12-17 20:37:54 +11:00
Peter Ross 6fb40779cd Silicon Graphics Movie (.mv) demuxer 
Signed-off-by: Peter Ross <pross@xvid.org>
 2012-12-17 20:37:54 +11:00
Michael Niedermayer 2e59142fa9 sctp: dont abort on invalid input 
Fixes Ticket1865

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-17 01:53:35 +01:00
Martin Storsjö e798085f96 rtpdec_vp8: Cosmetics: Fix bad alignment/indentation 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-16 21:33:20 +02:00
Martin Storsjö 3b2e8d1d21 rtpenc: Allow including a SDES/CNAME block in RTCP SR packets 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-16 21:32:58 +02:00
Martin Storsjö 65e053271a rtpenc_vp8: Include the picture number in VP8 packets 
This makes it easier for receivers to decide what to do if data
is lost.

Refactor calculating the max payload size, to avoid hardcoding the
header size in too many places, reducing the number of lines that
have to be touched if the header is adjusted further.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-16 21:32:13 +02:00
Piotr Bandurski cb8163d0bd bfi: set duration 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-16 16:53:01 +01:00
Michael Niedermayer de89dff8da brstm: ask for samples for version != 1.0 
This also avoids 2 unused variable warnings.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-16 15:05:31 +01:00
Paul B Mahol 5be38f9421 brstm: add missing new line to request for sample messages 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-16 13:04:17 +00:00
Paul B Mahol 1081d78746 build: fix idf demuxer dependency 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-16 12:00:23 +00:00
Piotr Bandurski 5648069270 aiff: support in24/in32 tags 
Supported by QuickTime, libaudiofile and Csound.
 2012-12-16 10:41:00 +00:00
James Almer 7959c26fb0 brstm: fix number of samples for the last block 
Signed-off-by: James Almer <jamrial@gmail.com>
 2012-12-16 10:34:33 +00:00
Piotr Bandurski d0bdcbcb28 thp: set duration 2012-12-16 10:27:54 +00:00
Michael Niedermayer 1e901ffc61 wrap_timestamp: remove unneeded check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-16 01:07:53 +01:00
Michael Niedermayer 1662bd350a lavf: fix integer overflows 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-16 01:05:36 +01:00
Harald Axmann 2d74dea84f lavf: Provide a monotonic timestamp to the outside world 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-15 21:28:45 +01:00
Stefano Sabatini ecebf6fc82 lavf/segment: provide more debug feedback when a new segment starts 2012-12-14 18:19:47 +01:00
Stefano Sabatini df5f9496e6 lavf/segment: add missing flags to segmenter option constants 2012-12-14 18:19:47 +01:00
Michael Niedermayer b2c2589ecf westwood_vqa: fix null pointer dereference 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-14 17:55:57 +01:00
Peter Ross 5c78a8129c sauce: test filetype correctly for datatype 5 (binary text) 2012-12-14 16:46:29 +11:00
Björn Axelsson 2947e7b7a7 flvenc: don't write random data if seek fails 
The FLV muxer tries to update the header in write_trailer, which is
impossible if writing to a pipe or network stream. Don't write header
data if seek to header fails.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-13 21:54:35 +01:00
Stefano Sabatini ddf6131a0a lavf/segment: add segment_start_number option 
Consistent with the image2 muxer.
 2012-12-13 21:38:43 +01:00
Stefano Sabatini d93d03a492 lavf/segment: add function set_segment_filename() 
Factorize.
 2012-12-13 21:05:07 +01:00
Michael Niedermayer 7726916c14 mpegts: check av_new_stream() return value. 
Fixes CID703728
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-13 17:46:17 +01:00
Nicolas George 2dbc84b1a8 lavf/matroskaenc: check for overflow in display width. 2012-12-13 12:45:07 +01:00
Michael Niedermayer 7897919a88 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  aacdec: Fix an off-by-one overwrite when switching to LTP profile from MAIN.
  x86inc: fix stack alignment on win64
  rtpproto: Remove unused defines

Conflicts:
	libavcodec/aacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-13 12:23:48 +01:00
Michael Niedermayer 2e5e2bf935 Merge commit 'f3f60dcbdd6ff2201526a603fe28293975bb7667' 
* commit 'f3f60dcbdd6ff2201526a603fe28293975bb7667':
  rtpdec_mpeg4: Cosmetic cleanup
  rtpdec: Cosmetic cleanup of the header
  rtpdec: Get rid of a useless _s suffix on a struct name

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-13 12:18:12 +01:00
Michael Niedermayer de7c95d551 Merge commit '7941159df6aad2d219e2a7184489be7a735dd944' 
* commit '7941159df6aad2d219e2a7184489be7a735dd944':
  rtpdec/enc: Remove outdated/useless/misleading comments
  rtpdec: Improve some comments
  rtpdec: Remove unused context variables
  rtpdec: Limit writing to the buffer size
  svq1: Fix building with -DDEBUG
  svq1: return meaningful error codes.

Conflicts:
	libavcodec/svq1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-13 12:06:19 +01:00
Nicolas George 26db6535fc lavf/matroskaenc: use integers to for display size. 
Avoid rounding differences between x86_32 and x86_64.
Fix trac ticket #1997.
 2012-12-12 20:59:34 +01:00
Michael Niedermayer 028cc42a16 read_gab2_sub: fix null pointer dereference 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-12 17:46:05 +01:00
Martin Storsjö 29d2595ad7 rtpproto: Remove unused defines 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-12 16:01:24 +02:00
Nicolas George 16c3cb9bbf lavf/concatdec: avoid leaking URLs. 
Use av_realloc instead of av_realloc_f to keep the original
array in case of failure: it is freed in full by the fail label.
 2012-12-12 12:15:57 +01:00
Michael Niedermayer 75b3911e5a mxf_set_audio_pts: fix division by 0 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-12 11:35:47 +01:00
Michael Niedermayer a0f659b275 oggspeexparse: fix array overread 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-12 11:21:23 +01:00
Martin Storsjö f3f60dcbdd rtpdec_mpeg4: Cosmetic cleanup 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-12 12:18:50 +02:00
Martin Storsjö 584a017925 rtpdec: Cosmetic cleanup of the header 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-12 12:18:44 +02:00
Martin Storsjö abf74a1169 rtpdec: Get rid of a useless _s suffix on a struct name 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-12 12:18:38 +02:00
Martin Storsjö 7941159df6 rtpdec/enc: Remove outdated/useless/misleading comments 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-12 12:18:33 +02:00
Martin Storsjö d6ec745246 rtpdec: Improve some comments 
The previous comment about the buffer was wildly inaccurate and
misleading.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-12 12:18:28 +02:00
Martin Storsjö e66d448c75 rtpdec: Remove unused context variables 
These stem from back when both the rtp muxer and rtp depacketizing
shared the same struct.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-12 12:18:22 +02:00
Martin Storsjö 81ef519252 rtpdec: Limit writing to the buffer size 
This fixes potential buffer overwrites.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-12 12:18:16 +02:00
Michael Niedermayer 8dbc384f15 Merge commit 'd04c17c91363a6b15d1ac2d79c817f3d5e2998b3' 
* commit 'd04c17c91363a6b15d1ac2d79c817f3d5e2998b3':
  swfdec: cosmetics: fix indentation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-12 10:16:23 +01:00
Michael Niedermayer d276f28b7d swfdec: print warning when len is cliped 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-12 10:14:06 +01:00
Michael Niedermayer be5389d585 Merge commit 'e70c5b034c4787377e82cab2d5565486baec0c2a' 
* commit 'e70c5b034c4787377e82cab2d5565486baec0c2a':
  swfdec: do better validation of tag length
  Make LOCAL_ALIGNED syntactically similar on all systems

Conflicts:
	libavformat/swfdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-12 09:55:56 +01:00
Michael Niedermayer a202541f9b cafdec: Check duration before use. 
Fix division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-12 01:22:09 +01:00
Michael Niedermayer 99a8552dae bfi: fix division by 0 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-12 01:22:09 +01:00
Michael Niedermayer 7d05bbb656 mxfdec: drop unneeded extradata padding 
Found-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-11 16:40:28 +01:00
Justin Ruggles d04c17c913 swfdec: cosmetics: fix indentation 2012-12-11 09:37:17 -05:00
Justin Ruggles e70c5b034c swfdec: do better validation of tag length 
Avoids trying to read a packet with 0 or negative size.
Avoids a potential infinite loop due to seeking backwards.

Partially based on a patch by Michael Niedermayer.
 2012-12-11 09:36:26 -05:00
Michael Niedermayer b65570808c mxfdec: fix leak of extradata 
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-11 14:43:47 +01:00
Peter Ross 53ae32d331 iff demuxer: support RGB8 and RGBN 2012-12-11 20:17:30 +11:00
Michael Niedermayer 67c1b5b026 lavf: remove unneeded pb check 
Fixes CID747727
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-11 09:34:47 +01:00
Michael Niedermayer b688a28470 astenc: fix assignment vs compare 
Fixes CID747736
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-11 08:56:42 +01:00
Michael Niedermayer a70b38d2dd lavf: fix memleak 
Fixes CID747738
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-11 08:51:34 +01:00
Stefano Sabatini 8e9056559e lavf/segment: add reset_timestamps option 
The new options reset the timestamps at each new segment, so that the
generated segments will have timestamps starting close to 0.

It is meant to address trac ticket #1425.
 2012-12-11 00:18:23 +01:00
Michael Niedermayer 0a60f83075 http: dont null check p, its unneeded 
Fixes CID747740
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-11 00:03:23 +01:00
Michael Niedermayer c73685398d swfdec: check lens validity 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-10 17:25:44 +01:00
Michael Niedermayer 6321e02896 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rtpdec: Remove an outdated todo comment
  rtpdec: Rename a static variable to normal naming conventions
  sh4: dsputil: remove duplicate of ff_gmc_c()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-10 12:13:42 +01:00
Peter Ross f540851ce3 mov: parse @PRM and @PRQ metadata tags 
These tags describe the product and quicktime library version respectively.
Originate from Adobe Premier, but some other products use them.
 2012-12-10 21:12:59 +11:00
Martin Storsjö ccb59c106a rtpdec: Remove an outdated todo comment 
This comment was added in e309128f, in 2002, and has been brought
along since then more or less unmodified.

The first point of the todo was implemented in dbf30963 in 2006,
the second one is not relevant to rtpdec.c (brought along from
rtp.c in 8eb793c4 in 2008) but would be more relevant to the
rtp muxer, although it isn't a good idea anyway.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-10 11:58:32 +02:00
Martin Storsjö 0d85663a47 rtpdec: Rename a static variable to normal naming conventions 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-10 11:58:25 +02:00
Michael Niedermayer 78ac7ee970 Merge commit '5d471b73d20616f5ac701ff62e5de49465cda264' 
* commit '5d471b73d20616f5ac701ff62e5de49465cda264':
  rtpdec: K&R formatting and spelling cosmetics
  cosmetics: Fix dropable --> droppable typo

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-10 01:27:10 +01:00
Michael Niedermayer 20899c54f0 http/utils: rename "demuxer" to mime_type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-10 01:00:16 +01:00
Paul B Mahol cef28b5602 tak: reduce difference with qatar 
Mostly cosmetics changes, but also makes
decoding little faster here.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-09 22:01:00 +00:00
Stefano Sabatini ad47ac20ae lavf/segment: remove silly assert(), improve feedback 
The code should not assert in case of invalid user input. Fails
gracefully instead.
 2012-12-09 20:42:35 +01:00
Michael Niedermayer 68bc012190 http/utils: move mime -> demuxer maping from http to utils 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-09 20:24:49 +01:00
Michael Niedermayer e3d95b54db probe: belive protocol content type if set and avoid lengthly probing. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-09 19:12:34 +01:00
Michael Niedermayer 76d851b656 http: export ICY content type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-09 19:12:34 +01:00
Nicolas George 160013736e lavf: TED Talks JSON captions demuxer. 2012-12-09 18:50:38 +01:00
Peter Ross 9282fbb9ad mpegts: demux asynchronous SMPTE 336M Key-Length-Value (KLV) metadata 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-09 17:15:46 +01:00
Michael Niedermayer 1374b5e15b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avio: K&R cosmetic formatting

Conflicts:
	libavformat/aviobuf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-09 14:08:01 +01:00
Martin Storsjö 5d471b73d2 rtpdec: K&R formatting and spelling cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-12-09 13:36:11 +01:00
Michael Niedermayer 5de1f7a7bd Merge commit '18e6f087c4a50bede8449ee164778945480be50c' 
* commit '18e6f087c4a50bede8449ee164778945480be50c':
  img2: document the options available
  hls: improve options description
  hls: use a meaningful long name
  hls: add start_number option
  h264: check for invalid zeros_left before writing

Conflicts:
	doc/demuxers.texi
	doc/muxers.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-09 13:35:49 +01:00
Michael Niedermayer 9f92e590ba mxfdec: fix double free 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-09 11:46:26 +01:00
Luca Barbato 1dd1c1c884 avio: K&R cosmetic formatting 2012-12-09 09:45:45 +01:00
Paul B Mahol 92f630eaf2 add forgotten AV_ prefix to some CODEC_IDs 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-09 01:47:58 +00:00
Mans Rullgard 91ac403b13 lavf: fix arithmetic overflows in avformat_seek_file() 
The values compared here can be more than INT64_MAX apart.  Since the
difference is always positive, converting to uint64_t before subtracting
gives the correct result without overflows.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-12-08 19:35:16 +00:00
Luca Barbato adbe03077d hls: use a meaningful long name 2012-12-08 17:04:22 +01:00
Luca Barbato 5fbceb2c63 hls: add start_number option 2012-12-08 17:04:22 +01:00
Michael Niedermayer 57cee85023 Merge commit '096abfa15052977eed93f0b5e01afd2d47c53c1f' 
* commit '096abfa15052977eed93f0b5e01afd2d47c53c1f':
  parser: fix large overreads
  bitstream: add get_bits64() to support reading more than 32 bits at once
  arm: detect cpu features at runtime on Linux

Conflicts:
	libavcodec/parser.c
	libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-08 14:58:56 +01:00
Michael Niedermayer 7efee140d7 get_bits: rename get_bits_longlong to get_bits64 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-08 14:53:01 +01:00
Michael Niedermayer b2b12a1022 mpegts: rename get_bits64 to get_ts64 
Renaming because of name conflict

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-08 14:52:50 +01:00
Reimar Döffinger 8ee14aa5c7 lavf: improve avoid_negative_ts help text 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-08 13:30:43 +01:00
Paul B Mahol 57231e4d5b tak: demuxer, parser, and decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-12-07 16:15:02 -05:00