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

46937 Commits

Author SHA1 Message Date
Stefano Sabatini 8b6aeb1fcd lavf/segment: fix value for the M3U8 EXT-X-MEDIA 
From the M3U8 specification:
|The EXT-X-MEDIA-SEQUENCE tag indicates the sequence number of the first
|URI that appears in a Playlist file.

Previously it was using the list index number. Also remove now unused
list_count field.
 2012-11-20 22:48:28 +01:00
Stefano Sabatini 5a1ac463e0 lavf/segment: do not pre-increment segment_idx value 
Increment the value just when a new segment with the given index is
started. Simplify logic, improve readability.
 2012-11-20 22:48:28 +01:00
Stefano Sabatini 2b31aa8895 lavf/segment: unbreak behavior for segment muxer 
The segment muxer presumes the use of AVFMT_GLOBALHEADER, ssegment should
be use in case of formats which requires no global headers.

Regression introduced when merging
0826d8513d.
 2012-11-20 22:48:28 +01:00
Stefano Sabatini b6c05879ea lavf/segment: consistently use "seg" in segment_start() 2012-11-20 22:48:28 +01:00
Stefano Sabatini 3d52083a27 ffmpeg: rework debugging timestamp logs in process_input() 
Print timestamps before and after ffmpeg timestamp postprocessing.
Help to debug how ffmpeg processes the input timestamps.
 2012-11-20 22:48:28 +01:00
Clément Bœsch cc88734c3c lavf/srtdec: trim line break event separators from packet. 
The muxer add them automatically, so this avoid having a bunch of line
breaks all over the output files. One '\n' is still kept/added because
the lavc subrip decoder seems to have trouble with line ending abruptly
(it doesn't flush correctly the tags). This bug is harmless but should
be fixed; though, this doesn't look like a trivial change. When this bug
gets fixed, we can consider removing the '\n' at the end of the packet.

The 2048B buffer limit was also removed while moving to AVBPrint API.
Note that this doesn't really matter since the decoder is limited as
well.
 2012-11-20 22:38:39 +01:00
Carl Eugen Hoyos d513fb1c75 Add -skip_initial_bytes option. 
Fixes ticket #1909.
 2012-11-20 22:04:14 +01:00
Carl Eugen Hoyos b1e190d0fd Correctly signal EOF when demuxing caf files. 2012-11-20 22:04:03 +01:00
Clément Bœsch 52b7823b73 swr: include stdint.h instead of inttypes.h. 
stdint.h is for the [u]int*_t types, which is the only thing we need for
the prototypes. inttypes.h includes stdint.h and defines more thing we
don't need here.

Bump micro in case a user app was relying on this include for its own
code.
 2012-11-20 21:53:06 +01:00
Michael Niedermayer 391f323615 rc: fix 10l typo in rc_max_available_vbv_use calculation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-20 21:11:05 +01:00
Paul B Mahol 50a9530bc4 fate: increase pcm coverage 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-20 19:29:00 +00:00
Clément Bœsch 186942a5e3 swr: fix a few typo in the public header. 2012-11-20 20:29:05 +01:00
Michael Niedermayer 156a75a459 swr-doxy: elaborate on swr_get_delay() and the timebase 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-20 20:05:08 +01:00
Michael Niedermayer 7cca237ddd swr: general doxy text about swr and example code. 
Based on doxy from avr
Reviewed-by: Clément Bœsch
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-20 19:46:08 +01:00
ChanMin Kim 4293464705 lavf/segment: do not copy codec_tag when not available 
Some muxers do not allow stream if codec_tag is incompatible.

Sometimes the passed input codec's codec_tag is not compatible with the
output muxer.

Because the codec_tag field of the segment muxer cannot be set, ffmpeg.c
doesn't know how to handle these cases.

Signed-off-by: ChanMin Kim <kcm1700@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-20 19:19:31 +01:00
Peter Ross 6253cee497 the hyperlink to the Developer's Certificate of Origin no longer works; use Linux kernel hyperlink 
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-20 19:19:31 +01:00
Paul B Mahol dd59f0125d add some planar PCM encoders 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-20 17:29:00 +00:00
Paul B Mahol f17f759544 pcmdec: use memcpy() when possible for planar decoders 
This is faster (at least with clang).

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-20 17:28:36 +00:00
Michael Niedermayer 07a866282f oggdec: fix memleak on header parsing failure 
Fixes Ticket1931

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-20 15:14:12 +01:00
Stefano Sabatini 99a30ad56d doc/platform: replace link to site arrozcru.org with link to ffmpeg.zeranoe.com 
ffmpeg.arrozcru.org is currently unmaintained, and it redirects to
ffmpeg.zeranoe.com.
 2012-11-20 14:59:39 +01:00
Michael Niedermayer 6dadb0e425 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  FATE: add 24-bit ALAC tests
  FATE: rename ALAC tests from alac-* to alac-16-*

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-20 14:35:27 +01:00
Paul B Mahol 00e02366a5 pcmenc: use ENCODE macro for pcm_s8 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-20 13:18:56 +00:00
Michael Niedermayer 2d232f8b88 pcm: revert from libavs planar code to durandals. 
The libav code does not work on big endian.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-20 14:04:38 +01:00
Michael Niedermayer 70c0f13a9a Merge commit '7c278d2ae410a64bdd89f1777026b4b963c30a1a' 
* commit '7c278d2ae410a64bdd89f1777026b4b963c30a1a':
  alacenc: support 24-bit encoding
  pcmdec: use planar sample format for pcm_s16le_planar
  vorbisdec: use float planar sample format

Conflicts:
	libavcodec/pcm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-20 13:34:27 +01:00
Paul B Mahol da8242e2d6 8svx: move pcm_s8_planar decoder to pcm.c 
Removes limitation of max 2 channels for pcm_s8_planar decoder by moving
it to more natural place.

AV_CODEC_ID_8SVX_RAW is not used by anything anymore and is going to be
removed.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-20 11:36:28 +00:00
Paul B Mahol a5e382ad7f 4xm: return error code if decode_init() failed 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-20 09:42:32 +00:00
Justin Ruggles b353321caa FATE: add 24-bit ALAC tests 2012-11-20 00:26:46 -05:00
Justin Ruggles 7c278d2ae4 alacenc: support 24-bit encoding 2012-11-20 00:26:45 -05:00
Justin Ruggles 3e6c2a67a1 FATE: rename ALAC tests from alac-* to alac-16-* 
This will distinguish ALAC 16-bit tests from ALAC tests with other bit
depths.
 2012-11-20 00:26:45 -05:00
Justin Ruggles c9d0f4506f pcmdec: use planar sample format for pcm_s16le_planar 2012-11-19 23:48:37 -05:00
Justin Ruggles 79b7747556 vorbisdec: use float planar sample format 2012-11-19 23:48:37 -05:00
Michael Niedermayer cf5f4c5169 aacsbr: check sample_rate before using it, fix division by 0 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-20 04:04:30 +01:00
Michael Niedermayer aed128f07d 4xmdec: fix integer overflow, null ptr dereference 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-20 03:00:22 +01:00
Peter Ross ed27ed9f4f iff: DEEP RLE 32-bit decoder 
Fixes ticket #1046.

Signed-off-by: Peter Ross <pross@xvid.org>
 2012-11-20 09:49:49 +11:00
Bojan Zivkovic a74ae4691a mips: Optimization of AC3 FP encoder and EAC3 FP decoder 
Signed-off-by: Bojan Zivkovic <bojan@mips.com>
Reveiwed-by: Vitor Sessak <vitor1001@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-19 22:24:44 +01:00
Clément Bœsch c02ae48271 swr: set default channel count options to 0. 
If not set, they will be defined using the channel layout setting, which
is much more convenient when using swr_alloc() instead of
swr_alloc_set_opts().
 2012-11-19 18:49:14 +01:00
Gavin Kinsey 19660a8876 Allow use of @ character in username and passwords embedded in URLs 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-19 18:02:28 +01:00
Michael Niedermayer ebf4750200 pthreads: increase MAX_BUFFERS due to 24c043c98e 
This might fix a hypothetical memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-19 17:32:13 +01:00
Michael Niedermayer c44a028e19 af_aresample: allocate at least 1 sample buffer. Fix null ptr dereference. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-19 15:55:54 +01:00
Piotr Bandurski 1b20877f34 vble: remove superfluous braces 
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-19 15:36:20 +01:00
Michael Niedermayer e6d81ce22e Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  x86: h264_intrapred: Fix C function names in comments
  x86: SPLATD: port to cpuflags

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-19 14:24:20 +01:00
Michael Niedermayer 4116151a4b Merge commit '1c5805521c3e406886341d752ebf38f8d41e1d13' 
* commit '1c5805521c3e406886341d752ebf38f8d41e1d13':
  PGS subtitles: Set AVSubtitle pts value
  configure: Refactor CPPFLAGS settings for glibc/uclibc
  configure: add basic support for ARM AArch64
  build: set -U__STRICT_ANSI__ for newlib

Conflicts:
	configure
	libavcodec/pgssubdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-19 14:05:41 +01:00
Michael Niedermayer fdbb6164a2 sbr: increase f_tablelim size, it appears it was too small by 1. 
Prevent out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-19 13:09:02 +01:00
Paul B Mahol b0d83e0dba doc/general: remove duplicate entry for ADPCM SMJPEG IMA 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-19 10:25:19 +00:00
Paul B Mahol 305fe9ae59 nut: add tag for PCM signed 8-bit planar 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-19 09:55:20 +00:00
Paul B Mahol 086e305276 doc/general: remove 8SVX audio, there is no such codec 
While here add missing PCM signed 8-bit planar.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-19 09:52:32 +00:00
Paul B Mahol 0dbf297229 doc/general: move 8SVX codecs to right section 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-19 09:52:25 +00:00
Carl Eugen Hoyos a5d4e94a97 Support iLBC in caf. 2012-11-19 10:19:50 +01:00
Michael Niedermayer ba353436a3 h264: dont stop parsing NALs without cleanup on DPC. 
Fixes a deadlock with frame threads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-19 04:08:11 +01:00
Piotr Bandurski 45d8537ccf vble: do not abort when version is not 1 
Fixes ticket #1923.

Reviewed-by: Derek Buitenhuis
 2012-11-19 01:55:51 +01:00