Michael Niedermayer
05a8114c71
doc/APIchanges: fill in more missing hash values and dates
all values before 2.5 seem to be filled in now
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8c8ee17e8d )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
5080ab26d3
doc/APIchanges: fill in and correct some values
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0d64982828 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
2029acb667
doc/APIchanges: Add av_find_best_pix_fmt_of_2() and av_get_pix_fmt_loss()
also add deprecation note for avcodec_get_pix_fmt_loss(), avcodec_find_best_pix_fmt_of_2()
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f7a1c5e4d2 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
0a878d0c94
doc/APIchanges: Fill in some more missing hash values
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit bbdd940f36 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
92595faab9
Merge commit '532c96a2158c04f265d750d54f2f103b8d9fe0ef' into release/2.4
* commit '532c96a2158c04f265d750d54f2f103b8d9fe0ef':
matroskadec: Fix read-after-free in matroska_read_seek()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
9d1e775b89
Merge commit '891de4b27a07b808839b9e873b6a886248c8fd6b' into release/2.4
* commit '891de4b27a07b808839b9e873b6a886248c8fd6b':
log: Unbreak no-tty support on 256color terminals
Conflicts:
libavutil/log.c
No change, FFmpeg is not affected by this bug
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Clément Bœsch
2c1d5f43cf
avfilter/dctdnoiz: fix slice_h computation
ceilf() can only work if the reminder of the division is not 0.
This fixes memory errors with for instance:
ffmpeg -f lavfi -i testsrc=s=800x500 -threads 3 -vf dctdnoiz -frames:v 1 -f null -
(cherry picked from commit eb7efaa924 )
11 years ago
Xiaohan Wang
532c96a215
matroskadec: Fix read-after-free in matroska_read_seek()
In matroska_read_seek(), |tracks| is assigned at the begining of the
function. However, functions like matroska_parse_cues() could reallocate
the tracks and invalidate |tracks|.
This assigns |tracks| only before using it, so that it will not get
invalidated elsewhere.
Bug-Id: chromium/427266
11 years ago
Luca Barbato
891de4b27a
log: Unbreak no-tty support on 256color terminals
11 years ago
Michael Niedermayer
fa1ca88cb6
Merge commit '4039f11ed82d84009b5146f0a563f33ced33e4db' into release/2.4
* commit '4039f11ed82d84009b5146f0a563f33ced33e4db':
Prepare for 11.2 Release
Conflicts:
RELEASE
Merge for metadata only as this is not correct for 2.4.*
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
2b95572b10
Merge commit '5f6f2412211609e46d3f3573f4ac4e136534f1d4' into release/2.4
* commit '5f6f2412211609e46d3f3573f4ac4e136534f1d4':
doc: Update the Changelog for release 11.2
Conflicts:
Changelog
No change as the changelog is not correct for FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
f5dd1270d9
Merge commit 'ff77fa754bf2d6e7231d2e050babefa9a13d1fec' into release/2.4
* commit 'ff77fa754bf2d6e7231d2e050babefa9a13d1fec':
vp7: fix checking vp7_feature_value_size()
See: 28f8114bd2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
6feb72a094
Merge commit '431f57f0467244686ae63a3d06a8cf51f60090ed' into release/2.4
* commit '431f57f0467244686ae63a3d06a8cf51f60090ed':
libopusenc: prevent an out-of-bounds read by returning early
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
02d979d007
Merge commit '88411b87b4bb3c5820ec232f26ba4a284c11a7f9' into release/2.4
* commit '88411b87b4bb3c5820ec232f26ba4a284c11a7f9':
display: fix order of operands
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
fb62580fb6
Merge commit '3f09d4f6d43468dbc9307bb937516a32287008dc' into release/2.4
* commit '3f09d4f6d43468dbc9307bb937516a32287008dc':
ffv1: fix out-of-bounds read
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
55c6a482d4
Merge commit '3aba00b1b331461611d32cfd56ebe8334f6d1b93' into release/2.4
* commit '3aba00b1b331461611d32cfd56ebe8334f6d1b93':
indeo3: check ff_set_dimensions return value
See: 81ed7efbe2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
faa67e9777
Merge commit '796bd81835ebcb69d40bc87b33f13924a5937a1b' into release/2.4
* commit '796bd81835ebcb69d40bc87b33f13924a5937a1b':
g2meet: check ff_set_dimensions return value
Conflicts:
libavcodec/g2meet.c
See: 3af9d8269e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
98ba288737
Merge commit '9e0a38d32b36fac7fd73bdb93e820ae0b9e03616' into release/2.4
* commit '9e0a38d32b36fac7fd73bdb93e820ae0b9e03616':
avs: check ff_set_dimensions return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
baef2736b0
Merge commit '39e07ac9fcaf3d412f9a33f427072e8ded032d24' into release/2.4
* commit '39e07ac9fcaf3d412f9a33f427072e8ded032d24':
ansi: check ff_set_dimensions return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
65b2973a54
Merge commit '21aeae9c679657a1537d0d9127eff280bafc901a' into release/2.4
* commit '21aeae9c679657a1537d0d9127eff280bafc901a':
svq1enc: check ff_get_buffer return value
Conflicts:
libavcodec/svq1enc.c
See: 7effc26ba7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
a0bad45cd8
Merge commit 'dd195c2c587f44dbc4be7f059ed182f7d83e6cb4' into release/2.4
* commit 'dd195c2c587f44dbc4be7f059ed182f7d83e6cb4':
on2avc: Fix out of array access
See: ce6a1ff2a1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
d48d2f166d
Merge commit '29e720da76ca353dbda9f881562902b41c355b77' into release/2.4
* commit '29e720da76ca353dbda9f881562902b41c355b77':
librtmp: append the correct field to the string
See: d1970929b5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
e82140b09b
avformat/librtmp: fix swfurl
Found-by: JULIAN GARDNER <joolzg@btinternet.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d1970929b5 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
4e251b23c3
Merge commit '61fdbf7ff64c0ae1bdd6a8d573092dc6924c1dba' into release/2.4
* commit '61fdbf7ff64c0ae1bdd6a8d573092dc6924c1dba':
lavc: fix bitshifts amount bigger than the type
Conflicts:
libavcodec/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
9b669f9b14
Merge commit '93bf4a74de99300fdc0deb83f672bf12e6f1c262' into release/2.4
* commit '93bf4a74de99300fdc0deb83f672bf12e6f1c262':
configure: Fix enabling memalign_hack automatically
Conflicts:
configure
See: 3d93ba5622
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
099e0178bf
Merge commit '527617485914004dc8b772056322ea5ae74c800d' into release/2.4
* commit '527617485914004dc8b772056322ea5ae74c800d':
lavc: Move the libtwolame encoder registration to the list for external libraries
Conflicts:
libavcodec/allcodecs.c
See: f5f98727b3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
dc84cf241c
Merge commit '32701252af65014bb68194bb61d67ec1882ae75d' into release/2.4
* commit '32701252af65014bb68194bb61d67ec1882ae75d':
xwma: Do not leak on failure path
Conflicts:
libavformat/xwma.c
See: 375a0c03a9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
206ca5c7c8
Merge commit '4d11e4b47db6387077682595d53e9a17b50511cb' into release/2.4
* commit '4d11e4b47db6387077682595d53e9a17b50511cb':
libtwolame: prevent a NULL pointer dereference
See: a586b3d9b1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Paul B Mahol
375c1050bf
libavcodec/libtwolame: fix null pointer dereference
Signed-off-by: Paul B Mahol <onemda@gmail.com>
(cherry picked from commit a586b3d9b1 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c2b658c0e7
Merge commit '5891fd017aa7bed4c423b8511090cf8641a0afa4' into release/2.4
* commit '5891fd017aa7bed4c423b8511090cf8641a0afa4':
dvdsubdec: Do not leak on failure path
Conflicts:
libavcodec/dvdsubdec.c
See: 7fa9f7ef1c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
f251409adc
Merge commit 'e9aeaa6441f6fd18fc951d9737887dcf8a9584c0' into release/2.4
* commit 'e9aeaa6441f6fd18fc951d9737887dcf8a9584c0':
qdm2: avoid integer overflow
See: ccfd8cffe8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
e3ce2a8773
Merge commit 'cce99f72d1b49d3dfee859136eeff3db32553750' into release/2.4
* commit 'cce99f72d1b49d3dfee859136eeff3db32553750':
mpegenc: prevent a NULL pointer dereference
See: 010adacbe2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
4f72aef342
Merge commit 'fbc20c3b85be169389b6c9f8806a311d3dea91ea' into release/2.4
* commit 'fbc20c3b85be169389b6c9f8806a311d3dea91ea':
aacdec: avoid an out-of-bounds write
Conflicts:
libavcodec/aacdec.c
See: ba02069a8e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
6f14434218
Merge commit '484e015dc8b9983297e9269b406c65084daf4528' into release/2.4
* commit '484e015dc8b9983297e9269b406c65084daf4528':
cook: Make sure there is enough extradata
See: c9e4554329
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
49f477071d
Merge commit 'b82170336f90d06c645d8252ddeccfc92c2f9ccb' into release/2.4
* commit 'b82170336f90d06c645d8252ddeccfc92c2f9ccb':
tiffenc: initialize return value
Conflicts:
libavcodec/tiffenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
5b965a508c
Merge commit '12e1a7013a53ad957c4ff11a3aebc0763024d24b' into release/2.4
* commit '12e1a7013a53ad957c4ff11a3aebc0763024d24b':
roqaudio: Always use the frame buffer on flush
Conflicts:
libavcodec/roqaudioenc.c
See: a1af505d66
See: c0b17ea106
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
6cb8e40f43
Merge commit 'e7ee74485b436c34591177c18c8643764a55d516' into release/2.4
* commit 'e7ee74485b436c34591177c18c8643764a55d516':
hnm4: Use av_image_check_size
See: e23b18321f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
b5b36e45b3
Merge commit '4edbb0955e043d698dcc1b5073b6e714f9cc7960' into release/2.4
* commit '4edbb0955e043d698dcc1b5073b6e714f9cc7960':
png_parser: fix size of chunk_lenght
Conflicts:
libavcodec/png_parser.c
See: 2ee6dca3b8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
f038623d53
Merge commit '2a75c0b1ca16b5480497de0d4c79ef122406a0b5' into release/2.4
* commit '2a75c0b1ca16b5480497de0d4c79ef122406a0b5':
aacsbr: change order of operation to prevent out of array read
Conflicts:
libavcodec/aacsbr.c
See: c2340831b8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
6aece62b50
Merge commit '34e7f70f9f493f340daab80eba4f12d005ec3e63' into release/2.4
* commit '34e7f70f9f493f340daab80eba4f12d005ec3e63':
assdec: check av_new_packet return value
Conflicts:
libavformat/assdec.c
See: 7c9f9685ae
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c7831e55b5
Merge commit '242fc6394fecb403bcbd0f652920f2647d0b08ae' into release/2.4
* commit '242fc6394fecb403bcbd0f652920f2647d0b08ae':
mtv: improve header check and avoid division by zero
Conflicts:
libavformat/mtv.c
See: 8b9b6332df
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
6f9bb83dbb
Merge commit 'bae05e5326703dad3bfe0ed5b31ba73ee9254515' into release/2.4
* commit 'bae05e5326703dad3bfe0ed5b31ba73ee9254515':
matroskaenc: write correct Display{Width, Height} in stereo encoding
Conflicts:
libavformat/matroskaenc.c
See: 6103faaa51
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
97a55f00d3
Merge commit '26ba78adacd8469fca97c8c833e2e6364b13b7c8' into release/2.4
* commit '26ba78adacd8469fca97c8c833e2e6364b13b7c8':
mov: fix assigment check
Conflicts:
libavformat/mov.c
See: af2e5061bb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
b6cd6da173
Merge commit '8a982092cc3436c25d68ec15b27277c176ce0061' into release/2.4
* commit '8a982092cc3436c25d68ec15b27277c176ce0061':
mxfdec: add missing break
See: cbda76c7c6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
d3316c3f85
Merge commit '19fc283dbb53a5f7d6658fd4edcfa59b99369b58' into release/2.4
* commit '19fc283dbb53a5f7d6658fd4edcfa59b99369b58':
lavf: replace rename() with ff_rename()
Conflicts:
libavformat/hdsenc.c
libavformat/internal.h
See: 95d2fc6a76
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
324797eb83
Merge commit 'b9b689550e7531b1a2cc893d2af623e37f266936' into release/2.4
* commit 'b9b689550e7531b1a2cc893d2af623e37f266936':
img2dec: check av_new_packet return value
Conflicts:
libavformat/img2dec.c
See: 3f8148911c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
298f7f1fac
Merge commit '7c710c38f6481b892e01d3c1e4781ad160b2935e' into release/2.4
* commit '7c710c38f6481b892e01d3c1e4781ad160b2935e':
audiointerleave: check av_new_packet return value
Conflicts:
libavformat/audiointerleave.c
See: 3ca8a23288
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
fefb152cd9
Merge commit 'a7e79f6a43bdc7e3b164dd78b060f0d5575a0cf0' into release/2.4
* commit 'a7e79f6a43bdc7e3b164dd78b060f0d5575a0cf0':
avfilter: check filter link validity
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
275cd55a0f
Merge commit '556a5090f2b0a20fd9998e1a327875f5b0c8d1d5' into release/2.4
* commit '556a5090f2b0a20fd9998e1a327875f5b0c8d1d5':
mp3dec: fix reading the Xing tag
Conflicts:
libavformat/mp3dec.c
See: 19ff479f69
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
749fadaa65
Merge commit '1551602b423755c4ed98c5b7b2c2d6504416726e' into release/2.4
* commit '1551602b423755c4ed98c5b7b2c2d6504416726e':
nutdec: check av_new_packet return value
Conflicts:
libavformat/nutdec.c
See: bb502411dd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago