]>
git.sesse.net Git - ffmpeg/log
Paul B Mahol [Sun, 1 Jan 2012 22:23:58 +0000 (23:23 +0100)]
Cosmetics: Replace -1 with PIX_FMT_NONE.
Michael Niedermayer [Sat, 31 Dec 2011 21:16:57 +0000 (22:16 +0100)]
h264: Fix frame sync / random access handling.
It seems I have misunderstood the spec when I implemented this
originally.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 31 Dec 2011 21:15:45 +0000 (22:15 +0100)]
h264: Fix recovery_frame initialization when recovery_frame is -1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 31 Dec 2011 21:14:53 +0000 (22:14 +0100)]
h264: reset picture->sync on allocation.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jean First [Sun, 1 Jan 2012 15:26:15 +0000 (16:26 +0100)]
mov: av_dlog use PRId64 instead of %ld
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jean First [Sun, 1 Jan 2012 15:26:12 +0000 (16:26 +0100)]
mxfdec: change av_log formatting %lx to PRIx64 and %li to PRIi64
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Jan 2012 15:09:23 +0000 (16:09 +0100)]
h264: add forgotten \n to "Invalid mix of idr and non-idr slices"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Jan 2012 14:27:38 +0000 (15:27 +0100)]
h264: Print pass in NAL debug output
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jean First [Sun, 1 Jan 2012 15:26:11 +0000 (16:26 +0100)]
af_astreamsync: remove unused variable
Signed-off-by: Jean First <jeanfirst@gmail.com>
Stefano Sabatini [Sat, 31 Dec 2011 13:12:01 +0000 (14:12 +0100)]
vf_tinterlace: implement interlace mode 5
Allow creating interlaced bottom field first video.
Carl Eugen Hoyos [Sun, 1 Jan 2012 04:04:25 +0000 (05:04 +0100)]
Update copyright year.
Carl Eugen Hoyos [Sun, 1 Jan 2012 03:44:46 +0000 (04:44 +0100)]
Support gray8a pam encoding.
Michael Niedermayer [Sun, 1 Jan 2012 02:46:06 +0000 (03:46 +0100)]
mpegpsenc: Fix integer overflow of the muxrate calculation.
this should fix the failure of h264-bsf-mp4toannexb on freebsd/openbsd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Jan 2012 01:54:31 +0000 (02:54 +0100)]
pthread: dont autoenable frame threads with visualization
This combination doesnt work
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Jan 2012 00:21:31 +0000 (01:21 +0100)]
pthread: Limit automatic threads to mb_height.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Jan 2012 00:13:06 +0000 (01:13 +0100)]
Revert
464f26889c99f194d112fcf1197795d341fad38b
The code is not needed for us and it doesnt work completely.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 31 Dec 2011 23:39:29 +0000 (00:39 +0100)]
svq3: Fix memory corruption introduced by automatic thread_count.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 31 Dec 2011 23:27:36 +0000 (00:27 +0100)]
mpegvideo: Do not error out on default values of thread_count.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 31 Dec 2011 22:24:53 +0000 (23:24 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
FATE: add tests for dfa
mpegaudiodec: fix seeking.
mpegaudiodec: fix compilation when testing the unchecked bitstream reader
threads: add sysconf based number of CPUs detection
threads: always include necessary headers for number of CPUs detection
threads: default to automatic thread count detection
Changelog: restore version <next> header
cook: K&R formatting cosmetics
Conflicts:
Changelog
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sat, 31 Dec 2011 21:33:58 +0000 (22:33 +0100)]
Do not map asf metadata key WM/Track to track.
WM/Track is 0-based (and deprecated in favour of WM/TrackNumber),
track is 1-based.
Fixes ticket #825.
Oana Stratulat [Thu, 29 Dec 2011 20:47:59 +0000 (22:47 +0200)]
FATE: add tests for dfa
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Carl Eugen Hoyos [Sat, 31 Dec 2011 19:45:04 +0000 (20:45 +0100)]
Only expand raw and packed 1bpp tiff horizontally if it is palettised.
Michael Niedermayer [Sat, 31 Dec 2011 19:25:02 +0000 (20:25 +0100)]
h264: Fix seeking in 00017.MTS
Fixes Ticket852
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Fri, 30 Dec 2011 21:08:21 +0000 (13:08 -0800)]
mpegaudiodec: fix seeking.
The safe bitstream reader does not allow using skip_bits_long() to seek to a
point before the start of the buffer, which was needed by the mp3 decoder.
This change instead calculates the start point of the first valid granule and
skips to that position.
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Justin Ruggles [Sat, 31 Dec 2011 18:36:48 +0000 (13:36 -0500)]
mpegaudiodec: fix compilation when testing the unchecked bitstream reader
Janne Grunau [Fri, 23 Dec 2011 23:27:12 +0000 (00:27 +0100)]
threads: add sysconf based number of CPUs detection
Can act as fallback and should work on a couple of Unix systems.
Janne Grunau [Fri, 23 Dec 2011 23:04:16 +0000 (00:04 +0100)]
threads: always include necessary headers for number of CPUs detection
Since the conditions for the actual usage are more specific a less
preferred method can be used. This would cause compilation errors
because necessary headers are not included.
Janne Grunau [Sun, 25 Dec 2011 10:45:05 +0000 (11:45 +0100)]
threads: default to automatic thread count detection
Janne Grunau [Sat, 31 Dec 2011 16:31:02 +0000 (17:31 +0100)]
Changelog: restore version <next> header
Indeo 4 decoder and SMJPEG demuxer are not included in 0.8_beta1. Move
them to version <next>.
Michael Niedermayer [Sat, 31 Dec 2011 15:51:35 +0000 (16:51 +0100)]
mxg: fix compiler warning for uninitialized variables
Based on work by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jean First [Fri, 30 Dec 2011 20:08:03 +0000 (21:08 +0100)]
id3v2: fix compiler warning for uninitialized variables
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 30 Dec 2011 19:36:11 +0000 (20:36 +0100)]
aacdec: Evaluate further PCE elements.
Fixes Music\ Station\ Super\ Live\ -\ 2011.12.23.mkv
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sat, 31 Dec 2011 16:15:43 +0000 (17:15 +0100)]
Fix mono* pam encoding.
Nicolas George [Fri, 30 Dec 2011 22:10:41 +0000 (23:10 +0100)]
libvorbis: proper error logging and return.
Reimar Döffinger [Fri, 30 Dec 2011 09:42:55 +0000 (10:42 +0100)]
Avoid uninitialized data in lcldec when ofs is 0 in MSZH.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Nicolas George [Sun, 6 Nov 2011 20:28:05 +0000 (21:28 +0100)]
lavfi: add amerge audio filter.
Nicolas George [Wed, 14 Dec 2011 20:33:48 +0000 (21:33 +0100)]
lavfi: add astreamsync audio filter.
Michael Niedermayer [Sat, 31 Dec 2011 14:27:51 +0000 (15:27 +0100)]
lavf: ffio_limit(), treat avio_size()==0 as error.
This works around issues arising from inputs that claim to have a
filesize of 0.
Reported-by: buzz_
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jean First [Fri, 30 Dec 2011 20:07:59 +0000 (21:07 +0100)]
lavd/lavfi: fix compiler warning for uninitialized variables
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Stefano Sabatini [Sat, 25 Jun 2011 11:06:24 +0000 (13:06 +0200)]
lavfi: port tinterlace filter from MPlayer
Port MPlayer tinterlace filter from MPlayer, with some ideas taken
from the FFmbc/libavfilter port, with the following main differences:
* added support for full-scale YUVJ formats
* added support for YUVA420P
* request_frame() on the filter is forced to return a frame
* some code factorization (related to the copy_picture_fields() function)
* fixed black padding values for mode 3
Stefano Sabatini [Tue, 27 Dec 2011 14:12:29 +0000 (15:12 +0100)]
lavfi: remove redundant definition of avfilter_copy_frame_props() in avfilter.h
Rationale: avfilter_copy_frame_props() was already defined in
libavfilter/avcodec.h, and keeping the lavc/lavfi API glue localized in a
specific file should ease maintainance and help the ones which use
libavfilter without depending on libavcodec.
Michael Niedermayer [Sat, 31 Dec 2011 03:14:27 +0000 (04:14 +0100)]
Revert "aacdec: Avoid unneeded reinit due to ADTS headers"
This has been fixed differently and its revert avoids error messages
when decoding xx.flv. This also reduces the difference to qatar.
This reverts commit
5a2b3f3a52070232a68582a502fb60a9226ca86a .
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 31 Dec 2011 03:49:33 +0000 (04:49 +0100)]
tiffdec: hotfix for fate failure.
Only use pal8 as output if the file has a palette or more than 2 colors.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 31 Dec 2011 02:39:22 +0000 (03:39 +0100)]
flvdec: Check avpriv_mpeg4audio_get_config() return
value before using its output.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jean First [Fri, 30 Dec 2011 20:08:08 +0000 (21:08 +0100)]
mpegts: remove unused variable
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jean First [Fri, 30 Dec 2011 20:08:05 +0000 (21:08 +0100)]
movenc: remove unused variables
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jean First [Fri, 30 Dec 2011 20:08:01 +0000 (21:08 +0100)]
cache: use av_freep instead of av_free in cache_open
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jean First [Fri, 30 Dec 2011 20:08:00 +0000 (21:08 +0100)]
cache: remove unused variable in cache_open
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jean First [Fri, 30 Dec 2011 20:07:58 +0000 (21:07 +0100)]
8svx: remove unused variable in eightsvx_decode_frame
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sat, 31 Dec 2011 01:00:33 +0000 (02:00 +0100)]
Fix decoding some 1bpp tiff files, they are palettized.
Fixes ticket #830.
Carl Eugen Hoyos [Sat, 31 Dec 2011 00:58:16 +0000 (01:58 +0100)]
Simplify tiff decoder by merging two functions.
Carl Eugen Hoyos [Sat, 31 Dec 2011 00:53:22 +0000 (01:53 +0100)]
tiff.c: Use switch / case instead of if / else where appropriate.
Michael Niedermayer [Sat, 31 Dec 2011 00:16:45 +0000 (01:16 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: whitespace cosmetics
fate: split off video codec FATE tests into their own file
fate: split off audio codec FATE tests into their own file
fate: split off Electronic Arts codec FATE tests into their own file
fate: split off QuickTime codec FATE tests into their own file
fate: split off voice codec FATE tests into their own file
fate: split off demuxer FATE tests into their own file
cosmetics: Drop unnecessary parentheses around return values.
fate: drop pointless _audio and _video suffixes from xan tests
qt-faststart: K&R reformatting; fix comment typos
FATE: Add test for H.264 MP4->annex.B bitstream filter.
Conflicts:
ffplay.c
tests/fate.mak
tests/fate/h264.mak
tests/fate/image.mak
tests/fate/lossless-audio.mak
tests/fate/lossless-video.mak
tests/fate/qtrle.mak
tests/fate/real.mak
tests/fate/screen.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Shitiz Garg [Fri, 30 Dec 2011 22:18:53 +0000 (03:48 +0530)]
cook: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Thu, 29 Dec 2011 20:26:30 +0000 (21:26 +0100)]
mlp_parser: Fix infinite loop with 0 bytes_left.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 27 Dec 2011 16:11:15 +0000 (17:11 +0100)]
fate: whitespace cosmetics
Diego Biurrun [Tue, 27 Dec 2011 16:00:18 +0000 (17:00 +0100)]
fate: split off video codec FATE tests into their own file
Diego Biurrun [Tue, 27 Dec 2011 15:48:56 +0000 (16:48 +0100)]
fate: split off audio codec FATE tests into their own file
Diego Biurrun [Tue, 27 Dec 2011 13:57:48 +0000 (14:57 +0100)]
fate: split off Electronic Arts codec FATE tests into their own file
Diego Biurrun [Wed, 14 Dec 2011 15:27:12 +0000 (16:27 +0100)]
fate: split off QuickTime codec FATE tests into their own file
Diego Biurrun [Wed, 14 Dec 2011 14:07:55 +0000 (15:07 +0100)]
fate: split off voice codec FATE tests into their own file
Diego Biurrun [Wed, 14 Dec 2011 20:47:23 +0000 (21:47 +0100)]
fate: split off demuxer FATE tests into their own file
Diego Biurrun [Thu, 29 Dec 2011 21:23:16 +0000 (22:23 +0100)]
cosmetics: Drop unnecessary parentheses around return values.
Diego Biurrun [Fri, 30 Dec 2011 17:43:26 +0000 (18:43 +0100)]
fate: drop pointless _audio and _video suffixes from xan tests
Diego Biurrun [Fri, 30 Dec 2011 15:54:52 +0000 (16:54 +0100)]
qt-faststart: K&R reformatting; fix comment typos
Michael Niedermayer [Fri, 30 Dec 2011 19:28:47 +0000 (20:28 +0100)]
flvdec: Add comment about the 5 second threshold
Idea-by: Reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mike Melanson [Fri, 30 Dec 2011 19:03:37 +0000 (11:03 -0800)]
FATE: Add test for H.264 MP4->annex.B bitstream filter.
This test uses an existing FATE sample (h264/interlaced_crop.mp4).
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Paul B Mahol [Fri, 30 Dec 2011 19:00:53 +0000 (20:00 +0100)]
Use more designated initializers.
Also remove some pointless NULL/0 assigments.
C++ code must be left as it is because named struct
initializers are not supported by C++ standard.
Paul B Mahol [Fri, 30 Dec 2011 18:42:59 +0000 (19:42 +0100)]
mp3enc: remove unused variable
Carl Eugen Hoyos [Fri, 30 Dec 2011 18:20:39 +0000 (19:20 +0100)]
Make sure configure does not fail just because unneeded third-party options are used.
Reimar Döffinger [Fri, 30 Dec 2011 09:37:33 +0000 (10:37 +0100)]
Avoid av_memcpy_backptr hang without extra branch.
This only happens for a "back" value of 0 which is invalid anyway,
but lcldec does not properly validate input.
Also extend the documentation to specify valid values.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Michael Niedermayer [Fri, 30 Dec 2011 04:12:38 +0000 (05:12 +0100)]
ljpegdec: fix point transform injection.
Fix Ticket842
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 29 Dec 2011 22:24:10 +0000 (23:24 +0100)]
flvdec: Print a warning in all failure cases of parse_keyframes_index()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 29 Dec 2011 22:23:34 +0000 (23:23 +0100)]
flvdec: Disable metadatacreator "MEGA" hack
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 29 Dec 2011 22:22:41 +0000 (23:22 +0100)]
flvdec: Check index for being valid
Fixes seeking in Enigma_Principles_of_Lust.flv
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 30 Dec 2011 02:46:24 +0000 (03:46 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: split off DPCM codec FATE tests into their own file
fate: split off PCM codec FATE tests into their own file
libvorbis: K&R reformatting cosmetics
libmp3lame: K&R formatting cosmetics
fate: Add a video test for xxan decoder
mpegvideo_enc: K&R cosmetics (line 1000-2000).
avconv: K&R cosmetics
qt-faststart: Fix up indentation
indeo4: remove two unused variables
doxygen: cleanup style to support older doxy
fate: add more tests for VC-1 decoder
applehttpproto: Apply the same reload interval changes as for the demuxer
applehttp: Use half the target duration as interval if the playlist didn't update
applehttp: Use the last segment duration as reload interval
lagarith: add decode support for arith rgb24 mode
Conflicts:
avconv.c
libavcodec/libmp3lame.c
libavcodec/mpegvideo_enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Fri, 30 Dec 2011 01:34:29 +0000 (02:34 +0100)]
Do not fail when decoding invalid v410 files with odd width.
Reviewed-by; Derek Buitenhuis
Michael Niedermayer [Thu, 29 Dec 2011 20:31:22 +0000 (21:31 +0100)]
nsvdec: Check av_malloc(string_size)
This can easily be NULL as string_size can be 2g in a damaged file.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Thu, 29 Dec 2011 13:03:03 +0000 (14:03 +0100)]
fate: split off DPCM codec FATE tests into their own file
Diego Biurrun [Wed, 14 Dec 2011 21:10:36 +0000 (22:10 +0100)]
fate: split off PCM codec FATE tests into their own file
Carl Eugen Hoyos [Thu, 29 Dec 2011 23:48:32 +0000 (00:48 +0100)]
Always assume the bmp palette as being opaque.
Diego Biurrun [Thu, 29 Dec 2011 20:37:05 +0000 (21:37 +0100)]
libvorbis: K&R reformatting cosmetics
Aneesh Dogra [Thu, 29 Dec 2011 21:19:55 +0000 (02:49 +0530)]
libmp3lame: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Aneesh Dogra [Thu, 29 Dec 2011 18:58:12 +0000 (00:28 +0530)]
fate: Add a video test for xxan decoder
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Aneesh Dogra [Thu, 29 Dec 2011 18:53:54 +0000 (00:23 +0530)]
mpegvideo_enc: K&R cosmetics (line 1000-2000).
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Aneesh Dogra [Thu, 29 Dec 2011 20:28:29 +0000 (01:58 +0530)]
avconv: K&R cosmetics
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Thu, 29 Dec 2011 01:34:43 +0000 (02:34 +0100)]
indeo5: Fix null pointer dereferences of ref_mb
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 29 Dec 2011 02:42:15 +0000 (03:42 +0100)]
h264_mp4toannexb_filter: pass error code through.
Bug-Found-by and Suggested bugfix: Tanami, Ohad
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Thu, 29 Dec 2011 16:43:30 +0000 (18:43 +0200)]
qt-faststart: Fix up indentation
This restores indentation after
65b875d8fcc .
Signed-off-by: Martin Storsjö <martin@martin.st>
Kostya Shishkov [Thu, 29 Dec 2011 16:25:26 +0000 (17:25 +0100)]
indeo4: remove two unused variables
Luca Barbato [Tue, 27 Dec 2011 03:51:39 +0000 (04:51 +0100)]
doxygen: cleanup style to support older doxy
Doxygen 1.7.5.1 had been used as reference while certain distributions
provide older and not fully compatible versions.
Nicolas George [Thu, 29 Dec 2011 15:30:19 +0000 (16:30 +0100)]
Revert "build: error on mixed declarations and code"
This reverts commit
9d6b2077b27980936efdc616e2f9c92a56b443fc .
This error is annoying while debugging, and if someone disables it for
convenience, it raises the odds of leaving ffmpeg unbuildable by default.
Aneesh Dogra [Thu, 29 Dec 2011 14:29:15 +0000 (15:29 +0100)]
fate: add more tests for VC-1 decoder
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Michael Niedermayer [Thu, 29 Dec 2011 04:05:52 +0000 (05:05 +0100)]
issdemux: Check packet_size for validity
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 29 Dec 2011 04:16:34 +0000 (05:16 +0100)]
qpeg: Check for overread in qpeg_decode_intra.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andrey Utkin [Wed, 28 Dec 2011 14:55:46 +0000 (16:55 +0200)]
applehttpproto: Apply the same reload interval changes as for the demuxer
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 27 Dec 2011 11:30:55 +0000 (13:30 +0200)]
applehttp: Use half the target duration as interval if the playlist didn't update
This is mandated in draft-pantos-http-live-streaming-07, section
6.3.4.
Signed-off-by: Martin Storsjö <martin@martin.st>
Andrey Utkin [Mon, 26 Dec 2011 19:25:52 +0000 (21:25 +0200)]
applehttp: Use the last segment duration as reload interval
According to draft-pantos-http-live-streaming-07, 6.3.4,
the duration of the last media segment in the playlist
should be used as initial minimum reload delay.
Signed-off-by: Martin Storsjö <martin@martin.st>
Thad Ward [Wed, 28 Dec 2011 05:45:55 +0000 (23:45 -0600)]
lagarith: add decode support for arith rgb24 mode
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Thu, 29 Dec 2011 00:40:34 +0000 (01:40 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
v410dec: Check for sufficient input data. Fixes crash
fate: Add v210 codec regression tests
mpegts: adjustable minimum PES payload
mpegts: properly output large audio packets
avformat: Add SMJPEG demuxer.
Indeo 4 decoder
Conflicts:
doc/general.texi
libavcodec/v410dec.c
libavcodec/version.h
libavformat/mpegtsenc.c
libavformat/smjpeg.c
libavformat/version.h
tests/codec-regression.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at>