summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add missing "const" all over the place.Reimar Döffinger2014-08-2932-57/+57
| | | | | | Only "./configure --enable-gpl" on x86 was tested. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* patcheck: check for pointer arrays that are not const.Reimar Döffinger2014-08-291-0/+1
| | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* avformat/wtvdec: seek over broken chunksPeter Ross2014-08-291-2/+27
| | | | | | | Fixes ticket #3898 Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/webmdashenc: use av_strlcpy() and allocate enough spaceMichael Niedermayer2014-08-291-2/+2
| | | | | | Fixes out of array read Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* fate/vpx: make webm dash manifest tests depend on the WEBM_DASH_MANIFEST demuxerMichael Niedermayer2014-08-291-3/+3
| | | | | Found-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/wavpack: increase WV_MAX_SAMPLESPaul B Mahol2014-08-291-1/+1
| | | | | | | This is maximal number of samples per frame that current wavpack can create. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* fate: Add basic tests for WebM Dash ManifestVignesh Venkatasubramanian2014-08-294-0/+117
| | | | | | | | Add fate tests that test out the functionality of WebM DASH Manifest XML generation. This patch contains the vpx.mak file changes and the reference gold XML files. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/avcodec: fix missing doxygen comment markerMichael Niedermayer2014-08-291-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat: drop redundant MATROSKA_VIDEO_STEREO_MODE_COUNT identifierMichael Niedermayer2014-08-294-6/+5
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '9e8bbe7d4d1dcd5fec491dbfbb98ed2038a7bed5'Michael Niedermayer2014-08-291-0/+1
|\ | | | | | | | | | | | | | | | | | | * commit '9e8bbe7d4d1dcd5fec491dbfbb98ed2038a7bed5': license: Mention that vf_interlace is GPL, not LGPL Conflicts: LICENSE.md Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * license: Mention that vf_interlace is GPL, not LGPLDiego Biurrun2014-08-281-0/+1
| |
* | Merge commit '4d686fb721b485ebbc4c7779d927d876c1e630f7'Michael Niedermayer2014-08-291-33/+100
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '4d686fb721b485ebbc4c7779d927d876c1e630f7': matroskaenc: convert avstream stereo3d side data during encoding Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: convert avstream stereo3d side data during encodingVittorio Giovara2014-08-281-18/+76
| | | | | | | | Write the StereoMode Embl to bitstream.
* | Merge commit 'd4ae8ac92f619507aadd021bb67b517d39d3a36f'Michael Niedermayer2014-08-285-2/+77
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit 'd4ae8ac92f619507aadd021bb67b517d39d3a36f': matroskadec: parse stereo mode on decoding Conflicts: Changelog libavformat/matroska.c libavformat/matroskadec.c See: 4c509fe305bc79a913ef1b690df6c910c732f608 and others Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskadec: parse stereo mode on decodingVittorio Giovara2014-08-284-2/+78
| | | | | | | | | | | | | | | | | | Convert the Matroska stereo format to the Stereo3D format, and add a Stereo3D side data to the stream. Bump the doctype version supported. Bug-Id: 728 / https://bugs.debian.org/757185
* | ffmpeg: Fix missing {} in Stream to Packet side data codeMichael Niedermayer2014-08-281-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '9301486408a480629336af4d7fd873c0f28fb2d5'Michael Niedermayer2014-08-285-2/+71
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit '9301486408a480629336af4d7fd873c0f28fb2d5': avcodec: add stream-level stereo3d side data Conflicts: doc/APIchanges libavcodec/avcodec.h libavcodec/utils.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: add stream-level stereo3d side dataVittorio Giovara2014-08-285-1/+69
| |
* | Merge commit 'f2583bc86eb5d7decc639fc9a36edc93e6003eef'Michael Niedermayer2014-08-281-0/+1
|\ \ | |/ | | | | | | | | | | * commit 'f2583bc86eb5d7decc639fc9a36edc93e6003eef': matroska: list supported extensions Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroska: list supported extensionsVittorio Giovara2014-08-281-0/+1
| |
* | Merge commit '58396e806c65fe0eb00e6ccf1980f810cdceed05'Michael Niedermayer2014-08-281-10/+10
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '58396e806c65fe0eb00e6ccf1980f810cdceed05': x11grab: Use a typedef for the context, as most other code does Conflicts: libavdevice/x11grab.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x11grab: Use a typedef for the context, as most other code doesLuca Barbato2014-08-281-10/+10
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '7bb505a33ca131906b2ceb2f298e104c862740ea'Michael Niedermayer2014-08-281-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '7bb505a33ca131906b2ceb2f298e104c862740ea': x11grab: Drop a spurious space in the extension reporting message Conflicts: libavdevice/x11grab.c See: 9af209712099699d717596f55b08b3bac8b6b563 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x11grab: Drop a spurious space in the extension reporting messageLuca Barbato2014-08-281-1/+1
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '20e82b41fcad23ebbb18d89948aebfcc53921198'Michael Niedermayer2014-08-281-17/+9
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '20e82b41fcad23ebbb18d89948aebfcc53921198': x11grab: Small near-cosmetic refactorings Conflicts: libavdevice/x11grab.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x11grab: Small near-cosmetic refactoringsLuca Barbato2014-08-281-20/+15
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'f07a4290a0e8f31796e348edd3ed06b8d15132d8'Michael Niedermayer2014-08-281-134/+139
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'f07a4290a0e8f31796e348edd3ed06b8d15132d8': x11grab: K&R formatting cosmetics Conflicts: libavdevice/x11grab.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x11grab: K&R formatting cosmeticsLuca Barbato2014-08-281-136/+142
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | avformat/soxenc: return more meaningful error codePaul B Mahol2014-08-281-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/h264: Move h264_vdpau_class under ifdef to avoid unused variable warningMichael Niedermayer2014-08-281-7/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/flashsv2enc: fix "unused variable" warningsMichael Niedermayer2014-08-281-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/libvpxenc: Adds support for constant quality mode in VP9.Deb Mukherjee2014-08-281-6/+19
| | | | | | | | | | | | | | | | | | | | | | Changes in the parameter mapping for libvpx to support the constant quality mode in VP9. The assumption in the patch is that if crf is provided but bitrate is 0, then the 'constant quality' mode of VP9 is used. However if both are present, the 'constrained quality' mode is used as before. Reviewed-by: James Zern <jzern@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/icoenc: Remove deprecated use of codec_nameMichael Niedermayer2014-08-281-1/+2
| | | | | | | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/ffprobe: fix -show_entries exampleStefano Sabatini2014-08-281-1/+1
| |
* | Adds support for setting aq_mode in libvpx encoderDeb Mukherjee2014-08-272-1/+13
| | | | | | | | | | Reviewed-by: James Zern <jzern@google.com> Signed-off-by: James Almer <jamrial@gmail.com>
* | Replace incorrect use of "multiply" with "multiple"James Darnley2014-08-275-5/+5
| | | | | | | | Also replace the plural form "multiplies" with "multiples".
* | avformat/rtpdec_asf: fix compiler warning about const qualifier being discardedMichael Niedermayer2014-08-271-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rdt: fix compiler warning about const qualifier being discardedMichael Niedermayer2014-08-271-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/aviobuf: remove uses of deprecated url_feof()Michael Niedermayer2014-08-271-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '8d27bf1cff35be406b0fd89d832e1852d4c573bc'Michael Niedermayer2014-08-272-489/+489
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '8d27bf1cff35be406b0fd89d832e1852d4c573bc': x86: xvid: K&R formatting cosmetics Conflicts: libavcodec/x86/xvididct_sse2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: xvid: K&R formatting cosmeticsDiego Biurrun2014-08-272-489/+489
| |
* | Merge commit 'dcb7c868ec7af7d3a138b3254ef2e08f074d8ec5'Michael Niedermayer2014-08-2710-52/+56
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dcb7c868ec7af7d3a138b3254ef2e08f074d8ec5': cosmetics: Make naming scheme of Xvid IDCT consistent with other IDCTs Conflicts: libavcodec/mpeg4videodec.c libavcodec/x86/Makefile libavcodec/x86/dct-test.c libavcodec/x86/xvididct_sse2.c libavcodec/xvididct.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Make naming scheme of Xvid IDCT consistent with other IDCTsDiego Biurrun2014-08-279-52/+56
| |
* | Merge commit '1f156af4274dc72d588620f6bedb4e9e66023c92'Michael Niedermayer2014-08-272-20/+0
|\ \ | |/ | | | | | | | | | | * commit '1f156af4274dc72d588620f6bedb4e9e66023c92': x86: xvid_idct: Drop unused definitions Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: xvid_idct: Drop unused definitionsDiego Biurrun2014-08-272-20/+0
| |
* | Merge commit '404731bd20e1df5880e6fe381e975ba48afc75b2'Michael Niedermayer2014-08-270-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '404731bd20e1df5880e6fe381e975ba48afc75b2': pulse: Set the wallclock option as default Conflicts: libavdevice/pulse_audio_dec.c No change, the option was already default in FFmpeg since a long time Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pulse: Set the wallclock option as defaultLuca Barbato2014-08-271-1/+1
| |
* | Merge commit 'ff771f79b55a346b4163d814b58ee4c98114745e'Michael Niedermayer2014-08-271-1/+1
|\ \ | |/ | | | | | | | | | | * commit 'ff771f79b55a346b4163d814b58ee4c98114745e': vc1: Initialize start_code_found to 0 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1: Initialize start_code_found to 0Luca Barbato2014-08-271-1/+1
| | | | | | | | Leftover of a4d3c20035946cbc1509aec2dc28d51c2a2f9a8e.
* | lavc/libwebpenc: use WebPMemoryWriterClear()James Almer2014-08-271-0/+4
| | | | | | | | | | | | | | WebPMemoryWriterClear() must be used instead of free() when libwebp ABI version is > 0x0203 Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
View Lorry Controller Status