generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
48,061 Commits 24 Branches 241 Tags 173 MiB
28b96efab5
Commit Graph

11922 Commits

Author SHA1 Message Date
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
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
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