summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit 'b69183f65d0f6f4cd7a4e6c0deb57d59b0185aba'Michael Niedermayer2014-10-22
|\ | | | | | | | | | | | | | | | | | | | | | | * 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-21
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 703721
* | Merge commit 'be42c0b8d57fe2ea769892d102ffd5561dc18709'Michael Niedermayer2014-10-21
|\| | | | | | | | | | | | | | | | | | | * 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-21
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 90558
* | Merge commit '7207dd8f829baee58b4df6c97c19ffde77039e8d'Michael Niedermayer2014-10-21
|\| | | | | | | | | | | | | | | | | | | | | * 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-21
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 733714
* | lavd/fbdev_common: report error during probing fbdev deviceLukasz Marek2014-10-21
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | lavd/fbdev_dec: use default device when not providedLukasz Marek2014-10-21
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | Merge commit '629b2ed0ac77d7c4bf1aeac5e70cafee5fa0fcae'Michael Niedermayer2014-10-21
|\| | | | | | | | | | | | | | | | | | | | | * 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-21
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 732242
* | Merge commit 'f22aa6b841dc54fa1dd804303885b1e230a5f629'Michael Niedermayer2014-10-21
|\| | | | | | | | | | | | | | | * 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-21
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 718141
* | Merge commit 'e73d26bbd65f1ac5fc73ef3fd24cab1bed8ba2e2'Michael Niedermayer2014-10-21
|\| | | | | | | | | | | | | | | | | | | | | * 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-21
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 732248
* | Merge commit '04d8af5f17961b9b7076b8c974e360feb08787c2'Michael Niedermayer2014-10-21
|\| | | | | | | | | | | | | | | | | | | | | * 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-21
| |
* | avcodec/mjpegdec: simplify chroma_height calculationMichael Niedermayer2014-10-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov.c: reasonable bitrate for fragmented mp4Mika Raento2014-10-21
| | | | | | | | | | | | | | | | 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-21
| | | | | | | | | | | | Fixes 129533924_640.jpg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/ffmpeg.texi: document the new -start_at_zero optionRodger Combs2014-10-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/concat: accept a single segmentStefano Sabatini2014-10-21
| | | | | | | | | | Simplify scripting operations, so that n=1 is not to be considered as a special case.
* | lavfi/afade: fix cur_sample computationStefano Sabatini2014-10-21
| | | | | | | | Use the correct timebase conversion.
* | lavf/mov.c: Prevent memory leak in case of invalid metadata reads.Thilo Borgmann2014-10-21
| | | | | | | | | | 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-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rtspcodes: introduce ff_rtsp_averror()Andrey Utkin2014-10-21
| | | | | | | | | | | | 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-21
| | | | | | | | | | | | | | 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-21
| | | | | | | | | | Reviewed-by: Benoit Fouet <benoit.fouet@free.fr> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd2771a1dc0a3695e8873adc16d068077f2417eea'Michael Niedermayer2014-10-20
|\| | | | | | | | | | | | | * 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-20
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 1238797
* | Merge commit '96bfb677478514db73d1b63b4213c97ad4269e8f'Michael Niedermayer2014-10-20
|\| | | | | | | | | | | | | | | | | | | | | * 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-20
| | | | | | | | | | | | Chapters do not have an event_flags field. Bug-Id: CID 1231990
* | Merge commit '350ed1829268d343b791208c8fd1cddd44d52a8e'Michael Niedermayer2014-10-20
|\| | | | | | | | | | | | | * commit '350ed1829268d343b791208c8fd1cddd44d52a8e': rtpdec_hevc: drop unnecessary check Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_hevc: drop unnecessary checkVittorio Giovara2014-10-20
| | | | | | | | | | | | len is always >=1 in that case. Bug-Id: CID 1238784
* | Merge commit '322b571d5591978efd6f6fee12181ac8900079fe'Michael Niedermayer2014-10-20
|\| | | | | | | | | | | | | | | * commit '322b571d5591978efd6f6fee12181ac8900079fe': rtmpproto: remove dead code See: 3a8b66af6cf6af9da5ff97a5930d10a7a4568558 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpproto: remove dead codeVittorio Giovara2014-10-20
| | | | | | | | | | | | | | Expression already evaluated before, redundant since 053386864219eccbcca1886c55f902f9555428a5. Bug-Id: CID 732199
* | Merge commit 'd1afd3e1d6e43f4d37ae147091f270124ac48e04'Michael Niedermayer2014-10-20
|\| | | | | | | | | | | | | | | * commit 'd1afd3e1d6e43f4d37ae147091f270124ac48e04': vf_format: check input validity See: ee16e0cacc16ea60c35a66796410012755263c3c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_format: check input validityVittorio Giovara2014-10-20
| | | | | | | | CC: libav-stable@libav.org
* | lavd: export all symbols with av_ prefixLukasz Marek2014-10-20
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | Merge commit '7b48bf95242ebf95366d24d32e4cfca6aa77c5e2'Michael Niedermayer2014-10-20
|\| | | | | | | | | | | | | | | * commit '7b48bf95242ebf95366d24d32e4cfca6aa77c5e2': wtv: clean memory on error See: e47024d72f326f7a76c9df90da861663fc5d5fc2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wtv: clean memory on errorVittorio Giovara2014-10-20
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 718002
* | Merge commit '9fbc613f0df1628e7e78bca791fa8833846f8210'Michael Niedermayer2014-10-20
|\| | | | | | | | | | | | | * commit '9fbc613f0df1628e7e78bca791fa8833846f8210': wtv: check seek_by_sector return value Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wtv: check seek_by_sector return valueVittorio Giovara2014-10-20
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 1198258
* | Merge commit 'd7f530b0d67fe3996dbfa990a47c865e0d1400a2'Michael Niedermayer2014-10-20
|\| | | | | | | | | | | | | | | * commit 'd7f530b0d67fe3996dbfa990a47c865e0d1400a2': aviobuf: check context before using it See: 7441d1ec330da810a0ffd44a02b2fc60add5b719 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aviobuf: check context before using itVittorio Giovara2014-10-20
| | | | | | | | | | | | | | Avoid a possible null pointer dereference. CC: libav-stable@libav.org Bug-Id: CID 1135769
* | Merge commit '02484d1a9316a9309fc1830825345ab79f6a8d60'Michael Niedermayer2014-10-20
|\| | | | | | | | | | | | | | | * commit '02484d1a9316a9309fc1830825345ab79f6a8d60': avio: fix sizeof argument See: a96577df38469e5075caa416d3374576d9ab64ee Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: fix sizeof argumentMichael Niedermayer2014-10-20
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 732284
* | Merge commit '8ab3b71e4b343cec3fa369a880ab4496d7345154'Michael Niedermayer2014-10-20
|\| | | | | | | | | | | | | | | * commit '8ab3b71e4b343cec3fa369a880ab4496d7345154': idcin: fix return check See: ee884c30233856b69fb87345944b4cdfe666fc0f Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * idcin: fix return checkVittorio Giovara2014-10-20
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 732198
* | configure: fix bug to ensure that HAVE_VSX is only enabled when HAVE_ALTIVEC ↵Rong Yan2014-10-20
| | | | | | | | | | | | is enabled and in LE environment Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/mov.c: Allocate buffer in case of long metadata entries.Thilo Borgmann2014-10-20
| | | | | | | | | | | | Fixes ticket #4018 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-25 22:22:55 +0000