summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3'Michael Niedermayer2013-07-2610-32/+32
|\ | | | | | | | | | | | | | | | | | | * commit '4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3': cosmetics: Add '0' to float constants ending in '.'. Conflicts: libavcodec/ra288.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Add '0' to float constants ending in '.'.Diego Biurrun2013-07-2510-32/+32
| |
* | Merge commit '6c145ecf785dc3d26ba3fed3ea9892cc80244625'Michael Niedermayer2013-07-262-439/+478
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '6c145ecf785dc3d26ba3fed3ea9892cc80244625': twinvq: K&R formatting cosmetics Conflicts: libavcodec/twinvq.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * twinvq: K&R formatting cosmeticsDiego Biurrun2013-07-252-439/+478
| |
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2013-07-252-1/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | * cehoyos/master: Show max bitrate for mpeg2 video streams in avcodec_string(). Allow native compilation on the iPhone. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Show max bitrate for mpeg2 video streams in avcodec_string().Carl Eugen Hoyos2013-07-251-0/+3
| | | | | | | | | | | | See also 25b7aa9
| * | Allow native compilation on the iPhone.Carl Eugen Hoyos2013-07-251-1/+1
| | |
* | | lavu/opt: show default values for AV_OPT_TYPE_PIXEL_FMT and ↵Paul B Mahol2013-07-251-0/+6
| | | | | | | | | | | | | | | | | | AV_OPT_TYPE_SAMPLE_FMT too Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | | avformat/gxfenc: Added support for writing correct auxiliary data for DV ↵Reuben Martin2013-07-252-19/+45
|/ / | | | | | | | | | | | | | | streams. Different aux data is written for DVCAM and DVPRO formats. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/can_merge_formats: fix memleakMichael Niedermayer2013-07-251-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/avfiltergraph: fix check using the wrong variablesMichael Niedermayer2013-07-251-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-07-251-8/+8
|\ \ | |/ | | | | | | | | | | * qatar/master: arm: Comment out unused labels in simple_idct_arm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * arm: Comment out unused labels in simple_idct_armMartin Storsjö2013-07-241-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building for iOS in thumb mode, gas-preprocessor.pl doesn't mark unused labels as thumb functions (as it does for other local labels, where it can figure out that they are functions due to being referenced in branch instructions). This leads to linker warnings for some of those local labels, such as: ld: warning: ARM function not 4-byte aligned: __a_evaluation from libavcodec/libavcodec.a(simple_idct_arm.o) Therefore, comment them out since they don't have any function. They do still have a value in documenting key points in the assembly source though. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avfilter/vf_scale: use the inputs color range when its set and its not ↵Michael Niedermayer2013-07-251-0/+6
| | | | | | | | | | | | overridden Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale/sws_getColorspaceDetails: dont fail for non yuvMichael Niedermayer2013-07-251-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: Support RGBA lpegsMichael Niedermayer2013-07-251-8/+23
| | | | | | | | | | | | Fixes Ticket896 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale: exchange src & dst chroma posMichael Niedermayer2013-07-241-3/+3
| | | | | | | | | | Found-by: wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vf_scale: add input h/v_chr_pos parametersMichael Niedermayer2013-07-242-1/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vf_scale: add output h/v_chr_pos parameterssMichael Niedermayer2013-07-241-0/+8
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/encoders: partially rewrite and reformat libx264 docsTimothy Gu2013-07-241-140/+285
| | | | | | | | | | | | | | | | | | | | | | | | Format is based on the thread: "[PATCH] doc/encoders: Add libopus encoder doc" (06-28-2013) http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/165368/ Also merge the two option sections (Mapping and Private options). Patch partially edited by Stefano Sabatini. Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | matroskaenc: implement CueRelativePositionBernie Habermeier2013-07-243-11/+18
| | | | | | | | | | | | | | | | | | | | This is a minimal change to matroskaenc that implements CueRelativePosition in the output. Most players will probably ignore this additional information, but it is in the matroska spec, and it'd be nice to be able to make use of it. Signed-off-by: Bernt Habermeier <bernt@wulfram.com> Tested-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpeg12dec: remove commented out assertMichael Niedermayer2013-07-241-2/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | documented that av_codec_close is required to callAnshul Maheshwari2013-07-241-0/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | alsdec: minor simplification in read_block()Michael Niedermayer2013-07-241-2/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-07-241-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | * qatar/master: 8bps: Make the bound-checks consistent Conflicts: libavcodec/8bps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * 8bps: Make the bound-checks consistentLuca Barbato2013-07-231-2/+2
| |
* | Merge commit 'bd7b4da0f4627bb6c4a7c2575da83fe6b261a21c'Michael Niedermayer2013-07-241-5/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'bd7b4da0f4627bb6c4a7c2575da83fe6b261a21c': 8bps: Bound-check the input buffer Conflicts: libavcodec/8bps.c See: 66ff90f4a3d81c25feaa672dc8cc9cc88017753d Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * 8bps: Bound-check the input bufferLuca Barbato2013-07-231-3/+7
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit '2f034f255c49050e894ab9b88087c09ebe249f3f'Michael Niedermayer2013-07-241-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '2f034f255c49050e894ab9b88087c09ebe249f3f': 4xm: Reject not a multiple of 16 dimension The newly added checks are redundant and thus replaced by asserts See: db5b4875514eb7740844f514dbf236c9179a6a93 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * 4xm: Reject not a multiple of 16 dimensionLuca Barbato2013-07-231-0/+6
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit 'ca488ad480360dfafcb5766f7bfbb567a0638979'Michael Niedermayer2013-07-241-64/+75
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'ca488ad480360dfafcb5766f7bfbb567a0638979': alsdec: Clean up error paths Conflicts: libavcodec/alsdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * alsdec: Clean up error pathsLuca Barbato2013-07-231-63/+75
| | | | | | | | | | | | Fix at least a memory leak. CC: libav-stable@libav.org
* | Merge commit '70ecc175c7b513a153ac87d1c5d219556ca55070'Michael Niedermayer2013-07-241-6/+12
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '70ecc175c7b513a153ac87d1c5d219556ca55070': alsdec: Fix the clipping range Conflicts: libavcodec/alsdec.c See: feaff427c0df015146f660199453bd8c0314e677 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * alsdec: Fix the clipping rangeLuca Barbato2013-07-231-6/+12
| | | | | | | | | | | | | | mcc_weightings is only 32 elements. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | avformat/http: support reading compressed dataZhang Rui2013-07-241-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | Derived from VLC's http module. Original authors: Antoine Cellerier <dionoea@videolan.org> Sébastien Escudier <sebastien-devel@celeos.eu> Rémi Duraffort <ivoire@videolan.org> Rémi Denis-Courmont <remi@remlab.net> Francois Cartegnie <fcvlcdev@free.fr> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utils: Warn the user about the lack of a lock manager if ↵Michael Niedermayer2013-07-241-0/+2
| | | | | | | | | | | | | | | | | | | | insufficient locks are detected A lock manager is not the only possibility to avoid open/close locking issues but its easier and more robust than maintaining a lot of lock/unlock calls. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utils: use av_assert0() to check validity of input pointers for ↵Michael Niedermayer2013-07-231-1/+1
| | | | | | | | | | | | start code search Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/avfiltergraph: minor cosmeticMichael Niedermayer2013-07-231-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter: Dont partially merge listsMichael Niedermayer2013-07-231-6/+62
| | | | | | | | | | | | | | | | | | | | This prevents the unneeded insertion of multiple aresample filters in some cases The format merging is moved to avoid having to call the channel layout merge twice. The channel layout merge code uses different structures and is not compatible with the added dry run wrappers. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/aviobuf/ffio_init_context: set seekable automaticallyHendrik Schreiber2013-07-231-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-07-230-0/+0
|\ \ | |/ | | | | | | | | | | | | * qatar/master: arm: Mangle external symbols properly in new vfp assembly files See: 47d57f24e35f0e9694c615b81511dde4cda95c72 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * arm: Mangle external symbols properly in new vfp assembly filesMartin Storsjö2013-07-223-4/+4
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | avcodec: add avcodec_chroma_pos_to_enum()Michael Niedermayer2013-07-234-2/+28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: add avcodec_enum_to_chroma_pos()Michael Niedermayer2013-07-232-0/+23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/libopenjpegen: XYZ 12 bit support for libopenjpeg encoderclook2013-07-231-0/+37
| |
* | libswscale: Adding RGB => XYZ supportclook2013-07-2311-17/+95
| |
* | avformat/hls: avoid floating point arithmeticMichael Niedermayer2013-07-221-3/+3
| | | | | | | | | | | | Should make things more reproducable across platforms Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/hls: parse EXTINF duration as floating-point numberZhang Rui2013-07-221-4/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | arm: Mangle external symbols properly in new vfp assembly filesMartin Storsjö2013-07-223-4/+4
| | | | | | | | | | Reviewed-by: Kostya Shishkov Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-07-222-1/+282
|\ \ | |/ | | | | | | | | | | * qatar/master: arm: Add VFP-accelerated version of qmf_32_subbands Merged-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status