Michael Niedermayer
8f23045b16
Merge commit 'be59675add2a05a7400b1abf86201ab069d7b1dd'
...
* commit 'be59675add2a05a7400b1abf86201ab069d7b1dd':
doc: Change the multitable rendering in texi2pod
Conflicts:
doc/texi2pod.pl
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
e40d92b1e4
Merge commit '59388dac69f9a79eddb003d1c6aad5ec89d4287b'
...
* commit '59388dac69f9a79eddb003d1c6aad5ec89d4287b':
fate: update tests for YVYU422 pixel format
Conflicts:
tests/ref/fate/filter-pixdesc
tests/ref/fate/filter-pixfmts-copy
tests/ref/fate/filter-pixfmts-null
tests/ref/fate/filter-pixfmts-scale
tests/ref/fate/filter-pixfmts-vflip
No change as the fate tests where updated in the merges that changed
the scores
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
233dbee3bc
Merge commit 'b6a09ef700786b4e1e871dfa0f5c386ea43bbd0a'
...
* commit 'b6a09ef700786b4e1e871dfa0f5c386ea43bbd0a':
rawvideo: Support decoding YVYU422 FourCC
See: ab7d6cb8f7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
ed962414bd
Merge commit '92b099daf4b8ef93513e38b43899cb8458a2fde3'
...
* commit '92b099daf4b8ef93513e38b43899cb8458a2fde3':
swscale: support converting YVYU422 pixel format
Conflicts:
libswscale/input.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
0a1cc04e6c
Merge commit '8b17243d1742279bcb2368f8d325ea71e66736c8'
...
* commit '8b17243d1742279bcb2368f8d325ea71e66736c8':
lavu: Add packed YVYU422 pixel format
Conflicts:
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
352e13e2a9
Merge commit '46439e156219d27f059cf687743ba5aacf238b87'
...
* 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>
11 years ago
Michael Niedermayer
6c019f05ed
Merge commit '718907cd881a0b593264aed059c0e00da13f9e15'
...
* 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>
11 years ago
Michael Niedermayer
1752b1459d
swscale/utils: scale filter_size in warning so that it can be used as max for the compile time define
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
7b2b06eb43
swscale/utils: dont print message about filter size when the cause is a malloc failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Luca Barbato
be59675add
doc: Change the multitable rendering in texi2pod
...
Makes it working better for our documentation purposes.
11 years ago
Vittorio Giovara
59388dac69
fate: update tests for YVYU422 pixel format
11 years ago
Vittorio Giovara
b6a09ef700
rawvideo: Support decoding YVYU422 FourCC
11 years ago
Michael Niedermayer
2daf580284
avcodec/j2kenc: use av_malloc(z)_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
8ff061095f
avcodec/libzvbi-teletextdec: remove * 1
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
818aaa7636
avcodec/libopencore-amr: use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Anshul Maheshwari
5b30f27592
rtspcodes: don't check for >0 on error codes macro
...
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>
11 years ago
Schenk, Michael
358f9ae639
configure: AVI demux needs exif
...
Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
2fcef4a044
swscale/swscale_internal: remove obsolete warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
955d7e26b6
swscale/swscale_internal: make the offset strings update themselfs when the MAX_FILTER_SIZE is changed
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
f6759d9ad4
swscale/x86/swscale_template: loose hardcoded dstw_offset
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
e20e854ca0
vcodec/bitstream: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
33c9bb943b
avcodec/avpacket: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
e4c180c05a
avcodec/a64multienc: use av_malloc(z)_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
53487268e5
cmdutils: use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c8a1f10cf4
avcodec/ac3enc_float: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
9b467d3cd5
examples/transcoding: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
b176320545
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Fix compilation with --disable-everything --enable-decoder=rawvideo.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
e36aaeca3a
avfilter/vf_colormatrix: fix memleak on error
...
Fixes CID1197065
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
5027f39712
swresample/resample: use av_malloc_array() where appropriate
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
a5290cb1ac
swresample/dither: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
f9158b01d0
swresample/resample: Limit filter length
...
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>
11 years ago
Carl Eugen Hoyos
7fcb4f6c51
Fix compilation with --disable-everything --enable-decoder=rawvideo.
11 years ago
Vittorio Giovara
92b099daf4
swscale: support converting YVYU422 pixel format
11 years ago
Vittorio Giovara
8b17243d17
lavu: Add packed YVYU422 pixel format
11 years ago
Vittorio Giovara
46439e1562
mp2: match twolame default options
11 years ago
Paul B Mahol
718907cd88
libtwolame MP2 encoding support
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
11 years ago
Michael Niedermayer
0d225863f2
Merge remote-tracking branch 'qatar/master'
...
* 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>
11 years ago
Carl Eugen Hoyos
836b60ce2b
Fix standalone compilation of vp7 and vp8 decoder.
...
Fixes ticket #3536 .
11 years ago
Carl Eugen Hoyos
993a5afaad
Read aspect ratio from tiff image files.
11 years ago
Vittorio Giovara
17a75a8c09
libxvid: fix missing end of line character
...
Error introduced in 5ce7ca68b8
.
11 years ago
Schenk, Michael
845414bbb1
avformat/oggdec: reset nstreams in close
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Schenk, Michael
b0a8521383
avformat/mov: reset drefs_count in close
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Matt Oliver
158a80cc0b
Remove leal op to fix icl inline asm.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Reynaldo H. Verdejo Pinochet
02497a5dc8
ffserver: don't hardcode RTSP status codes
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
11 years ago
Reynaldo H. Verdejo Pinochet
5267a5d783
rtspcodes: add full list of RTSP status codes
...
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>
11 years ago
Reynaldo H. Verdejo Pinochet
0c5a6ef886
ffserver: nits & typos
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
11 years ago
Thilo Borgmann
fdaf8372c2
configure: Check for generated output in check_header_oc.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
a75ba1e116
avcodec/h264/find_start_code: factorize addition out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
13aa575764
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
xtea: Add Doxy @file and group
See: 50f52a5498
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
a6fa3a476a
Merge commit 'f73495686d109ffffaa8c0387e790e7997326229'
...
* commit 'f73495686d109ffffaa8c0387e790e7997326229':
adler32: Fix doxy group definition
See: 624672fcce
and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago