Michael Niedermayer
421c116fc4
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Fix a typo in amr.c.
Remove an unneeded include of avassert.h from amr.c.
Do not allow writing invalid wav channel layouts by default.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
849d40dce6
avcodec/mpegvideo_enc: change some asserts to av_asserts
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
968516cebf
avformat/nut: add ff_nut_audio_extra_tags to demuxer too
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Carl Eugen Hoyos
cf79f20275
Fix a typo in amr.c.
11 years ago
Carl Eugen Hoyos
2a3ff9fbba
Remove an unneeded include of avassert.h from amr.c.
11 years ago
Carl Eugen Hoyos
bf87d582b1
Do not allow writing invalid wav channel layouts by default.
...
Neither WMP nor QT play wav files with too large channel layouts.
Fixes ticket #3543 .
11 years ago
Michael Niedermayer
f703dae7aa
avcodec/cngdec: use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
2773ab36cc
avcodec/jpeglsdec/ff_jpegls_decode_lse: check len field validity
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
020600eed1
avcodec/jpeglsdec: ask for sample for "oversized image"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
375013e3d6
avcodec/mpeg12dec: drop confusing av_dlog()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Anthoine Bourgeois
d8ab7f31dd
avcodec/dirac_arith: Fix build with PIC and stack-check options
...
Fixes Ticket3540
The function dirac_get_arith_bit in libavcodec/dirac_arith.h can't be
built with PIC and check-stack because the asm code needs 6 registers
and PIC and check-stack options take 1 each and x86 is quite limited
in this area.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
7ac2f7e413
avutil/log: factor "level != AV_LOG_INFO/8" checks out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
dddacf780f
avcodec/sanm: use named consant instead of literal number
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
acf112ba6e
avcodec/mpegvideo: remove AVFrame padding, as the hack isnt needed anymore
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
2ca553ed9c
avcodec/snowenc: remove operations that have become redundant with AVFrame pointers
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
59a53842d3
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mpegvideo: operate with pointers to AVFrames instead of whole structs
Conflicts:
libavcodec/h261dec.c
libavcodec/h263dec.c
libavcodec/intrax8.c
libavcodec/mpeg12enc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/mpegvideo_xvmc.c
libavcodec/msmpeg4.c
libavcodec/ratecontrol.c
libavcodec/vaapi.c
libavcodec/vc1dec.c
libavcodec/vdpau_vc1.c
See: fc567ac49e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
60ef0c6f90
Merge commit '60fd7d36c47d62d4c603bf16c213b1a924f5cfcf'
...
* commit '60fd7d36c47d62d4c603bf16c213b1a924f5cfcf':
fate: correctly set sample rate for mp2 tests
Conflicts:
tests/fate/acodec.mak
tests/lavf-regression.sh
one hunk has been ommited as it breaks fate
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Thilo Borgmann
c740e083bc
configure: Fail on missing prototypes in check_oc.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
44841528c1
avcodec/mpegaudioenc_template: reorder operations to prevent integer overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
9d66aa2c8f
avcodec/mpegaudioenc_template: dont crash on bitrate=0
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
d98688efb1
swscale/input: replace assert() by av_assert1()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
624327988f
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
doc: Completely document the x264 options
Conflicts:
doc/encoders.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
43935842bd
Merge commit '0d671ade99059fd47b155df85c10c35eb6d54878'
...
* commit '0d671ade99059fd47b155df85c10c35eb6d54878':
doc: Use a 3 columns multitable
Conflicts:
doc/encoders.texi
No change as we dont use a multitable for this list
we could of course switch to one though if it looks better
comments welcome
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
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
wm4
f6774f905f
mpegvideo: operate with pointers to AVFrames instead of whole structs
...
The most interesting parts are initialization in ff_MPV_common_init() and
uninitialization in ff_MPV_common_end().
ff_mpeg_unref_picture and ff_thread_release_buffer have additional NULL
checks for Picture.f, because these functions can be called on
uninitialized or partially initialized Pictures.
NULL pointer checks are added to ff_thread_release_buffer() stub function.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
11 years ago
Vittorio Giovara
60fd7d36c4
fate: correctly set sample rate for mp2 tests
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
e6e8be542b
doc: Completely document the x264 options
...
And fix an option mismatch.
11 years ago
Luca Barbato
0d671ade99
doc: Use a 3 columns multitable
...
Make the html output much nicer.
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