RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
66,039 Commits 36 Branches 398 Tags 244 MiB
Commit Graph

66039 Commits

Author SHA1 Message Date
Mika Raento 58e0402e02 segment: don't access outside seg->frames array 
Fixes wrong number of segments output and undefined memory access.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-02 11:38:36 +02:00
Michael Niedermayer 35469835bb Merge commit 'e48d1ea541be4592ebac89875557407ca958b7a9' 
* commit 'e48d1ea541be4592ebac89875557407ca958b7a9':
  ismindex: improve diagnostics

Conflicts:
	tools/ismindex.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-02 11:20:13 +02:00
Mika Raento e48d1ea541 ismindex: improve diagnostics 
This improves error messages for completely and somewhat broken inputs.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-09-02 09:48:44 +03:00
Mark Harris 4cabee50f6 tools/normalize.py: both input and output file names are required 2014-09-02 07:31:34 +02:00
Clément Bœsch e6b125e3be avutil/pixelutils: add small buffers tests 2014-09-02 07:29:41 +02:00
Rong Yan 6abeaf2781 build sys: enable the decoding_encoding example under the ffmpeg/doc/examples 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-02 04:19:15 +02:00
Carl Eugen Hoyos 7cf1f0f4af Fix standalone compilation of the snow decoder. 2014-09-01 23:30:57 +02:00
Mark Harris 1b3a98f137 doc/filters.texi: fix filter name in examples 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-01 21:50:52 +02:00
Thomas Volkert f8164f6728 Add missing changelog entry 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-01 21:40:34 +02:00
Michael Niedermayer f9aadf1fc4 Merge commit 'e205fe6831fe1b5445f7827b5c916425620b4ab5' 
* commit 'e205fe6831fe1b5445f7827b5c916425620b4ab5':
  mpeg4videodec: Fix low_delay error message

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-01 21:01:33 +02:00
Michael Niedermayer f626eaa58e Merge commit '63f800ca5f4f6b38f3789a7edb03bfabe8bacdd2' 
* commit '63f800ca5f4f6b38f3789a7edb03bfabe8bacdd2':
  aac_adtstoasc_bsf: Return proper error code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-01 20:51:44 +02:00
Michael Niedermayer 38c4316fff Merge commit 'b8962d64cc71af241601bcab5c3fcdc5735ef4ae' 
* commit 'b8962d64cc71af241601bcab5c3fcdc5735ef4ae':
  dxva2: Clean up definition of _WIN32_WINNT

Conflicts:
	libavcodec/dxva2.h

See: 89946c8403
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-01 20:45:50 +02:00
Michael Niedermayer 052cd1ce72 Merge commit '4600a85eaa6182e5a27464f6b9cae5a9ddbf3098' 
* commit '4600a85eaa6182e5a27464f6b9cae5a9ddbf3098':
  dxva2: Pass variable of correct type to IDirectXVideoDecoder_GetBuffer()

Conflicts:
	libavcodec/dxva2_h264.c
	libavcodec/dxva2_mpeg2.c
	libavcodec/dxva2_vc1.c

See: 64c53fa16a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-01 20:31:13 +02:00
Michael Niedermayer b01d2a5533 ffmpeg: Enable compute_edt only when the subtitles are used for a output stream instead of a filter 
Fixes/works around Ticket3768

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-01 19:51:58 +02:00
Michael Niedermayer a2dbf379f0 avcodec/dvbsubdec: make compute_edt user settable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-01 19:51:58 +02:00
Reimar Döffinger e8d0b84e8a h261dec, ituh263dec: Move condition. 
Stops compiler from doing incredibly stupid things.
With vsynth1-flv inner loop goes from 3501 to 3275
decicycles.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-09-01 19:41:20 +02:00
Reimar Döffinger 36c0043344 h261dec, ituh263dec: ensure CLOSE_READER is done on error paths, too. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-09-01 19:41:20 +02:00
Reimar Döffinger 2a00812d82 h261dec, ituh263dec: Avoid unnecessary -1 inside inner loop. 
3646 -> 3597 decicycles in inner loop when decoding
vsynth1-flv.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-09-01 19:41:20 +02:00
Timothy Gu 8d6ec61186 general: Fix usage of @float 
makeinfo chokes on that.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-01 16:21:44 +02:00
Gabriel Dume e205fe6831 mpeg4videodec: Fix low_delay error message 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-09-01 05:37:00 -07:00
Gabriel Dume 63f800ca5f aac_adtstoasc_bsf: Return proper error code 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-09-01 05:37:00 -07:00
Diego Biurrun b8962d64cc dxva2: Clean up definition of _WIN32_WINNT 
Only set a value if _WIN32_WINNT is undefined or smaller than 0x0600. This is
cleaner than unconditional definition and avoids a number of redefinition
warnings. Also only define a value in one of the two dxva2 headers.
 2014-09-01 12:23:59 +02:00
Diego Biurrun 4600a85eaa dxva2: Pass variable of correct type to IDirectXVideoDecoder_GetBuffer() 
This avoids related incompatible pointer type warnings.
 2014-09-01 12:23:58 +02:00
Clément Bœsch 343f07e15c RELEASE_NOTES: mention libmodplug detection change 2014-09-01 11:36:02 +02:00
Stefano Sabatini d4ec07dfe7 lavu/avstring: check for overlong encodings in av_utf8_decode() 
Fix reopened trac ticket #1163.
 2014-09-01 10:47:24 +02:00
Clément Bœsch 36952786a5 build: use pkg-config to detect libmodplug 
Fix static build, at least for OSX.
 2014-09-01 09:03:26 +02:00
Michael Niedermayer 97b88096dc Merge commit '37c46743ee42df1d6986ba3c996e3af5b95511f7' 
* commit '37c46743ee42df1d6986ba3c996e3af5b95511f7':
  avcodec: fix missing doxygen comment marker

See: 22652dc2b8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-01 04:20:23 +02:00
Michael Niedermayer 4250753497 avformat/mpegts: favor DESC_types over probed codecs 
Fixes Ticket3766
Fixes dvb_teletext detection

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-01 03:22:34 +02:00
Michael Niedermayer 37c46743ee avcodec: fix missing doxygen comment marker 2014-09-01 00:52:22 +01:00
Reynaldo H. Verdejo Pinochet b627385b4b ffserver: tests, use image2 instead of pgmyuv 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-08-31 18:18:40 -04:00
Reimar Döffinger 935453102b ituh263dec: Optimize new RL_VLC based decoding. 
Together with the switch to RL_VLC this results in
a speedup of about 30% in this inner loop.
Overall speedup only relevant for medium to high bitrate
streams.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-31 20:13:58 +02:00
Reimar Döffinger c0d32686dd h261dec: Optimize new RL_VLC based decoding. 
Together with the switch to RL_VLC this results in about
10% speedup for this inner loop.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-31 20:13:51 +02:00
Reimar Döffinger da0a670b3c h261, h263 decoders: convert to RL_VLC. 
Some additional optimizations in following patch.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-31 20:09:54 +02:00
Reimar Döffinger 3efc174fd6 aacps_tablegen: replace TABLE_CONST by const. 
Doesn't change generated code, just is more consistent
and a bit less error-prone.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-31 18:33:27 +02:00
Reimar Döffinger 1a558cec64 intmath.h: Remove duplicated ARM include. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-31 18:33:27 +02:00
Michael Niedermayer f0d4f00f24 avcodec/mjpegdec: fix green line at the bottom with upscale v 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-31 15:33:30 +02:00
Michael Niedermayer 63a52ca134 avcodec/mjpegdec: fix green vertical line at the right with upscale h 
Fixes Ticket3891

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-31 15:16:36 +02:00
Reimar Döffinger 6d7aa437e1 vf_drawtext: move "static const" before "struct". 
This is consistent with all other occurrences.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-31 10:41:42 +02:00
Reimar Döffinger 2ca7edda89 lavu/hash.c: Add missing "static const". 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-31 10:33:02 +02:00
Reimar Döffinger 03bf457241 Add av_cold to table generation functions. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-31 10:33:02 +02:00
Reimar Döffinger 4fe448738e WMA: add "const" to avoid warnings with hardcoded tables. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-31 10:31:09 +02:00
Reimar Döffinger 3bc5d2a064 ac3dec_fixed: add missing "static const". 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-31 10:25:36 +02:00
Reimar Döffinger c9a4ec7969 lavfi: add const/static const to pix_fmts arrays. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-31 10:25:36 +02:00
Reimar Döffinger 18464d7270 sipr16kdata.h: add forgotten const. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-31 10:25:36 +02:00
Reimar Döffinger 2bb66cc8be fft_template: Move variables to where they are used. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-31 10:25:36 +02:00
Reimar Döffinger 1654514ab0 fft: add ff_ prefix to some global arrays. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-31 10:25:36 +02:00
Michael Niedermayer e0237208b4 avcodec/h264: Do not get stuck on IDR inter frames 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-31 04:09:06 +02:00
Reimar Döffinger 8c63a0d171 xv.c: Add missing const to lookup table. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-30 18:02:45 +02:00
Paul B Mahol bd6f145820 avformat/dfa: use avio_feof() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-08-30 15:50:22 +00:00
wm4 b173f5c155 oggdec: fix invalid free on error 
The read_packet callback passes a pointer to a stack-allocated AVPacket.
Attempting to free it with av_free() makes no sense.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-30 16:38:14 +02:00