summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit 'b6a09ef700786b4e1e871dfa0f5c386ea43bbd0a'Michael Niedermayer2014-04-09
|\ | | | | | | | | | | | | | | * commit 'b6a09ef700786b4e1e871dfa0f5c386ea43bbd0a': rawvideo: Support decoding YVYU422 FourCC See: ab7d6cb8f770c3b88a8139d1182fcc934062f891 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rawvideo: Support decoding YVYU422 FourCCVittorio Giovara2014-04-08
| |
* | Merge commit '92b099daf4b8ef93513e38b43899cb8458a2fde3'Michael Niedermayer2014-04-09
|\| | | | | | | | | | | | | | | | | | | * commit '92b099daf4b8ef93513e38b43899cb8458a2fde3': swscale: support converting YVYU422 pixel format Conflicts: libswscale/input.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: support converting YVYU422 pixel formatVittorio Giovara2014-04-07
| |
* | Merge commit '8b17243d1742279bcb2368f8d325ea71e66736c8'Michael Niedermayer2014-04-09
|\| | | | | | | | | | | | | | | | | | | * commit '8b17243d1742279bcb2368f8d325ea71e66736c8': lavu: Add packed YVYU422 pixel format Conflicts: libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavu: Add packed YVYU422 pixel formatVittorio Giovara2014-04-07
| |
* | Merge commit '46439e156219d27f059cf687743ba5aacf238b87'Michael Niedermayer2014-04-09
|\| | | | | | | | | | | | | | | | | | | * commit '46439e156219d27f059cf687743ba5aacf238b87': mp2: match twolame default options Not merged as the change breaks fate, also forcing resampling to specific sample rate reduces quality, and would be like rescaling every movie to 1080. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mp2: match twolame default optionsVittorio Giovara2014-04-07
| |
* | Merge commit '718907cd881a0b593264aed059c0e00da13f9e15'Michael Niedermayer2014-04-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '718907cd881a0b593264aed059c0e00da13f9e15': libtwolame MP2 encoding support Conflicts: Changelog configure doc/general.texi libavcodec/Makefile libavcodec/libtwolame.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libtwolame MP2 encoding supportPaul B Mahol2014-04-07
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | swscale/utils: scale filter_size in warning so that it can be used as max ↵Michael Niedermayer2014-04-09
| | | | | | | | | | | | for the compile time define Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale/utils: dont print message about filter size when the cause is a ↵Michael Niedermayer2014-04-09
| | | | | | | | | | | | malloc failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/j2kenc: use av_malloc(z)_array()Michael Niedermayer2014-04-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/libzvbi-teletextdec: remove * 1Michael Niedermayer2014-04-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/libopencore-amr: use av_mallocz_array()Michael Niedermayer2014-04-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | rtspcodes: don't check for >0 on error codes macroAnshul Maheshwari2014-04-08
| | | | | | | | | | | | | | | | Avoids a warning with gcc 4.7 and -Wtype-limits. Albeit superfluous (At least gcc 4.8 didnt consider this been a problem). Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
* | configure: AVI demux needs exifSchenk, Michael2014-04-08
| | | | | | | | | | Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale/swscale_internal: remove obsolete warningMichael Niedermayer2014-04-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale/swscale_internal: make the offset strings update themselfs when the ↵Michael Niedermayer2014-04-08
| | | | | | | | | | | | MAX_FILTER_SIZE is changed Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale/x86/swscale_template: loose hardcoded dstw_offsetMichael Niedermayer2014-04-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vcodec/bitstream: use av_malloc_array()Michael Niedermayer2014-04-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/avpacket: use av_malloc_array()Michael Niedermayer2014-04-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/a64multienc: use av_malloc(z)_array()Michael Niedermayer2014-04-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdutils: use av_mallocz_array()Michael Niedermayer2014-04-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/ac3enc_float: use av_malloc_array()Michael Niedermayer2014-04-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | examples/transcoding: use av_malloc_array()Michael Niedermayer2014-04-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2014-04-08
|\ \ | | | | | | | | | | | | | | | | | | * cehoyos/master: Fix compilation with --disable-everything --enable-decoder=rawvideo. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Fix compilation with --disable-everything --enable-decoder=rawvideo.Carl Eugen Hoyos2014-04-08
| | |
* | | avfilter/vf_colormatrix: fix memleak on errorMichael Niedermayer2014-04-08
| | | | | | | | | | | | | | | Fixes CID1197065 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | swresample/resample: use av_malloc_array() where appropriateMichael Niedermayer2014-04-08
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | swresample/dither: use av_malloc_array()Michael Niedermayer2014-04-08
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | swresample/resample: Limit filter lengthMichael Niedermayer2014-04-08
|/ / | | | | | | | | | | | | | | | | Related to CID1197063 The limit choosen is arbitrary and much larger than what makes sense. It avoids the need for checking arithmetic operations with the length for overflow Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-04-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: libxvid: fix missing end of line character Conflicts: libavcodec/libxvid.c No change as the buggy modification wasnt merged, ffmpeg handles the case where both lumi and variance masking are set, differently Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libxvid: fix missing end of line characterVittorio Giovara2014-04-07
| | | | | | | | Error introduced in 5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1.
* | Fix standalone compilation of vp7 and vp8 decoder.Carl Eugen Hoyos2014-04-07
| | | | | | | | Fixes ticket #3536.
* | Read aspect ratio from tiff image files.Carl Eugen Hoyos2014-04-07
| |
* | avformat/oggdec: reset nstreams in closeSchenk, Michael2014-04-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: reset drefs_count in closeSchenk, Michael2014-04-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Remove leal op to fix icl inline asm.Matt Oliver2014-04-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffserver: don't hardcode RTSP status codesReynaldo H. Verdejo Pinochet2014-04-07
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
* | rtspcodes: add full list of RTSP status codesReynaldo H. Verdejo Pinochet2014-04-07
| | | | | | | | | | | | | | Also add reason phrases from http://www.ietf.org/rfc/rfc2326.txt and macro to translate. Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
* | ffserver: nits & typosReynaldo H. Verdejo Pinochet2014-04-07
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
* | configure: Check for generated output in check_header_oc.Thilo Borgmann2014-04-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264/find_start_code: factorize addition outMichael Niedermayer2014-04-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-04-07
|\| | | | | | | | | | | | | | | * qatar/master: xtea: Add Doxy @file and group See: 50f52a5498ff02c997d16b8181f32b933ce94b6b Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xtea: Add Doxy @file and groupTimothy Gu2014-04-07
| |
* | Merge commit 'f73495686d109ffffaa8c0387e790e7997326229'Michael Niedermayer2014-04-07
|\| | | | | | | | | | | | | | | * commit 'f73495686d109ffffaa8c0387e790e7997326229': adler32: Fix doxy group definition See: 624672fcce84c41e9e2fe9ff3ec3fd56140b175f and others Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * adler32: Fix doxy group definitionTimothy Gu2014-04-07
| | | | | | | | | | | | Based on a patch by James Almer <jamrial@gmail.com>. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'e10fd08aa7fbe8645545ad2e8721f0ed03c8e06a'Michael Niedermayer2014-04-07
|\| | | | | | | | | | | | | | | | | | | * commit 'e10fd08aa7fbe8645545ad2e8721f0ed03c8e06a': h264: Refactor decode_nal_units Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Refactor decode_nal_unitsLuca Barbato2014-04-06
| |