summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Added STL demuxer and decoderEejya Singh2014-10-2214-5/+208
| | | | Signed-off-by: Clément Bœsch <u@pkh.me>
* ffserver_conf: factorize parse function per config tagLukasz Marek2014-10-222-585/+546
| | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* ffserver_config: clean up variable initializationLukasz Marek2014-10-221-11/+5
| | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* ffserver: move configuration code to separate fileLukasz Marek2014-10-224-1118/+1194
| | | | | | | | This commit doesn't change any existing logic. It moves ffserver configuration related code to separate file. It intends to make maintaining easier. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* avcodec/tiffenc: properly compute packet sizeChristophe Gisquet2014-10-221-3/+3
| | | | | | | | | | | The bytes per row is a better indication of it. Helps resolving ticket #3874 by fixing ffmpeg's encoder and transforming the issue in a issue with non-compliant decoders. ffmpeg's one is ok, but unfortunately, many others aren't handling correctly unusual chroma samplings. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: avoid endlessly reading from one input while another is unavailableMichael Niedermayer2014-10-221-2/+2
| | | | | | | Testcase in Ticket 4051 Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/mux: Fix assertion failure due to max_interleave_delta and poor inputMichael Niedermayer2014-10-221-1/+9
| | | | | | Fixes Ticket4051 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avfilter/vf_idet: Fixes issue with idet not flushing last frame.Neil Birkbeck2014-10-223-1/+33
| | | | | | | | | | | | | | | | | | Uses a similar approach as vf_yadif to flush the last frame in idet. Quick test with 50 frames from vsynth1: ./ffmpeg.old -i fate-suite/ffmpeg-synthetic/vsynth1/%02d.pgm -vf idet -f mp4 -y /dev/null 2>&1 | grep Multi (gives) [Parsed_idet_0 @ 0x261ebb0] Multi frame detection: TFF:0 BFF:0 Progressive:48 Undetermined:1 ./ffmpeg -i fate-suite/ffmpeg-synthetic/vsynth1/%02d.pgm -vf idet -f mp4 -y /dev/null 2>&1 | grep Multi (gives) [Parsed_idet_0 @ 0x35a0bb0] Multi frame detection: TFF:0 BFF:0 Progressive:49 Undetermined:1 Fate tests have been updated. (In testing, it seems this filter will also need a subsequent patch for single frame input) Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/matroskadec: Fix cluster parsing loop which gathers seek informationMichael Niedermayer2014-10-221-2/+2
| | | | | | | | Fixes Ticket2263 Fixes Ticket3934 Reviewed-by: Rodger Combs <rodger.combs@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* tools/crypto_bench: add CAST5 supportJames Almer2014-10-211-0/+45
| | | | | Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* avcodec/mjpegdec: use FF_CEIL_RSHIFT() for widthMichael Niedermayer2014-10-221-1/+1
| | | | | | No testcase known Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf/cinedec: Fix a typo in the file header.Carl Eugen Hoyos2014-10-221-1/+1
|
* Merge commit 'af7ca6ea124b82b337a6b96e10963e88eba57ebe'Michael Niedermayer2014-10-221-4/+4
|\ | | | | | | | | | | | | | | | | | | | | * commit 'af7ca6ea124b82b337a6b96e10963e88eba57ebe': nutdec: check av_new_packet return value Conflicts: libavformat/nutdec.c See: bb502411ddb9fe1928d4a999693a3a49b83f8698 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nutdec: check av_new_packet return valueVittorio Giovara2014-10-211-2/+4
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 733713
* | Merge commit 'b69183f65d0f6f4cd7a4e6c0deb57d59b0185aba'Michael Niedermayer2014-10-221-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'b69183f65d0f6f4cd7a4e6c0deb57d59b0185aba': nutenc: check for negative index rather than assert Conflicts: libavformat/nutenc.c Not merged, the assert is correct Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nutenc: check for negative index rather than assertVittorio Giovara2014-10-211-1/+4
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 703721
* | Merge commit 'be42c0b8d57fe2ea769892d102ffd5561dc18709'Michael Niedermayer2014-10-211-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'be42c0b8d57fe2ea769892d102ffd5561dc18709': rmdec: stricter error check to avoid theoretical unitialized use Conflicts: libavformat/rmdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rmdec: stricter error check to avoid theoretical unitialized useVittorio Giovara2014-10-211-1/+1
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 90558
* | Merge commit '7207dd8f829baee58b4df6c97c19ffde77039e8d'Michael Niedermayer2014-10-211-2/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '7207dd8f829baee58b4df6c97c19ffde77039e8d': rmdec: check av_new_packet return value Conflicts: libavformat/rmdec.c See: c01a462cda8d7f298a3ac6d20752d23a11e43a8a Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rmdec: check av_new_packet return valueVittorio Giovara2014-10-211-1/+3
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 733714
* | lavd/fbdev_common: report error during probing fbdev deviceLukasz Marek2014-10-211-1/+6
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | lavd/fbdev_dec: use default device when not providedLukasz Marek2014-10-211-2/+8
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | Merge commit '629b2ed0ac77d7c4bf1aeac5e70cafee5fa0fcae'Michael Niedermayer2014-10-211-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '629b2ed0ac77d7c4bf1aeac5e70cafee5fa0fcae': flvdec: make sure to check create_stream and report the same error Conflicts: libavformat/flvdec.c See: d7d5b5dfc1b6f29646d2c1908c9bac8677f34256 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvdec: make sure to check create_stream and report the same errorVittorio Giovara2014-10-211-2/+5
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 732242
* | Merge commit 'f22aa6b841dc54fa1dd804303885b1e230a5f629'Michael Niedermayer2014-10-211-0/+1
|\ \ | |/ | | | | | | | | | | | | * commit 'f22aa6b841dc54fa1dd804303885b1e230a5f629': flvdec: avoid unitialized use of a struct member See: 396ddcf22d55fa7e735d69eed22a4a4b1649b73c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvdec: avoid unitialized use of a struct memberVittorio Giovara2014-10-211-0/+1
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 718141
* | Merge commit 'e73d26bbd65f1ac5fc73ef3fd24cab1bed8ba2e2'Michael Niedermayer2014-10-211-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'e73d26bbd65f1ac5fc73ef3fd24cab1bed8ba2e2': smoothstreamingenc: explict cast to avoid overflow Conflicts: libavformat/smoothstreamingenc.c See: b399816d9c3d0fc3efd742b04f269c1055cc6e2b Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * smoothstreamingenc: explict cast to avoid overflowVittorio Giovara2014-10-211-1/+1
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 732248
* | Merge commit '04d8af5f17961b9b7076b8c974e360feb08787c2'Michael Niedermayer2014-10-210-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '04d8af5f17961b9b7076b8c974e360feb08787c2': fate-mpeg4: use TARGET_SAMPLES for resize tests Conflicts: tests/fate/mpeg4.mak See: c40a1bd253f673d821a5df2a7a863a1837446123 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate-mpeg4: use TARGET_SAMPLES for resize testsJanne Grunau2014-10-211-1/+1
| |
* | avcodec/mjpegdec: simplify chroma_height calculationMichael Niedermayer2014-10-212-9/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov.c: reasonable bitrate for fragmented mp4Mika Raento2014-10-211-0/+11
| | | | | | | | | | | | | | | | If using MFRA for timestamps, the stream may start from a large offset and/or have gaps. With this change we calculate the bitrate based on frames we've seen. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: Support 24111100 pix fmt idMichael Niedermayer2014-10-211-4/+13
| | | | | | | | | | | | Fixes 129533924_640.jpg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/ffmpeg.texi: document the new -start_at_zero optionRodger Combs2014-10-211-0/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/concat: accept a single segmentStefano Sabatini2014-10-211-1/+1
| | | | | | | | | | Simplify scripting operations, so that n=1 is not to be considered as a special case.
* | lavfi/afade: fix cur_sample computationStefano Sabatini2014-10-211-1/+1
| | | | | | | | Use the correct timebase conversion.
* | lavf/mov.c: Prevent memory leak in case of invalid metadata reads.Thilo Borgmann2014-10-211-6/+8
| | | | | | | | | | Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rtsp: Use ff_rtsp_averror()Andrey Utkin2014-10-213-17/+18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rtspcodes: introduce ff_rtsp_averror()Andrey Utkin2014-10-211-0/+7
| | | | | | | | | | | | Currently this is another name for ff_http_averror() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg_opt: Add -start_at_zero option.Rodger Combs2014-10-211-1/+4
| | | | | | | | | | | | | | This automatically shifts input timestamps to start at 0 instead of the file's starting timestamp when using -copyts. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/libutvideodec: print extradata size if unsupportedMichael Niedermayer2014-10-211-1/+1
| | | | | | | | | | Reviewed-by: Benoit Fouet <benoit.fouet@free.fr> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd2771a1dc0a3695e8873adc16d068077f2417eea'Michael Niedermayer2014-10-201-1/+3
|\ \ | |/ | | | | | | | | | | * commit 'd2771a1dc0a3695e8873adc16d068077f2417eea': rtpproto: Free the addrinfo pointer on failure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpproto: Free the addrinfo pointer on failureLuca Barbato2014-10-201-1/+3
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 1238797
* | Merge commit '96bfb677478514db73d1b63b4213c97ad4269e8f'Michael Niedermayer2014-10-201-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '96bfb677478514db73d1b63b4213c97ad4269e8f': nutdec: Prevent a memory corruption Conflicts: libavformat/nutdec.c See: 05dd5368a92718f3a25f97f4697acffbabc7458f Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nutdec: Prevent a memory corruptionLuca Barbato2014-10-201-2/+3
| | | | | | | | | | | | Chapters do not have an event_flags field. Bug-Id: CID 1231990
* | Merge commit '350ed1829268d343b791208c8fd1cddd44d52a8e'Michael Niedermayer2014-10-201-2/+0
|\ \ | |/ | | | | | | | | | | * commit '350ed1829268d343b791208c8fd1cddd44d52a8e': rtpdec_hevc: drop unnecessary check Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_hevc: drop unnecessary checkVittorio Giovara2014-10-201-2/+0
| | | | | | | | | | | | len is always >=1 in that case. Bug-Id: CID 1238784
* | Merge commit '322b571d5591978efd6f6fee12181ac8900079fe'Michael Niedermayer2014-10-200-0/+0
|\ \ | |/ | | | | | | | | | | | | * commit '322b571d5591978efd6f6fee12181ac8900079fe': rtmpproto: remove dead code See: 3a8b66af6cf6af9da5ff97a5930d10a7a4568558 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpproto: remove dead codeVittorio Giovara2014-10-201-3/+0
| | | | | | | | | | | | | | Expression already evaluated before, redundant since 053386864219eccbcca1886c55f902f9555428a5. Bug-Id: CID 732199
* | Merge commit 'd1afd3e1d6e43f4d37ae147091f270124ac48e04'Michael Niedermayer2014-10-201-1/+3
|\ \ | |/ | | | | | | | | | | | | * commit 'd1afd3e1d6e43f4d37ae147091f270124ac48e04': vf_format: check input validity See: ee16e0cacc16ea60c35a66796410012755263c3c Merged-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud