virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Code Issues Releases Activity
67,925 Commits 37 Branches 400 Tags 463 MiB
305b03097d
Commit Graph

67925 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Almer
305b03097d lavf/apngdec: print currently unsupported in-stream tags in a more readable form 
Also use length and not stream position

Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-11-23 13:01:26 -03:00
Carl Eugen Hoyos
78093cf849 Print a warning if vp6 is muxed into flv: The output is flipped. 
Fixes ticket #4132.
 2014-11-23 13:22:27 +01:00
Carl Eugen Hoyos
600e38f563 Fix standalone compilation of the apng decoder on x86. 2014-11-23 13:21:29 +01:00
Clément Bœsch
6e411d9cc7 avcodec/microdvddec: support non persistent italic marker '/' 
Inspired from a patch by Michal Wazgird <mplayer@cyryl.net>

See https://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2014-November/072772.html
 2014-11-23 13:13:38 +01:00
Clément Bœsch
8ef46f4a0c avcodec/microdvddec: support various broken form of color tags 
Inspired by a patch from Michal Wazgird <mplayer@cyryl.net>

See https://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2014-November/072772.html
 2014-11-23 12:17:54 +01:00
Reimar Döffinger
cad3148ea3 xface: reduce stack usage by directly storing 2 bytes data instead of pointers. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-11-23 06:51:18 +01:00
Reimar Döffinger
dfc6f56c5a xface: reduce table sizes. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-11-23 06:51:18 +01:00
Reimar Döffinger
6369a7b742 xface: Fix encoder crashes due to too small on-stack array. 
Also add a FATE test.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-11-23 06:51:18 +01:00
Reimar Döffinger
d0682b5eb0 svq1enc: reduce stack usage of recursively-called function. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-11-23 06:51:18 +01:00
Reimar Döffinger
458aadf862 lpc: Reduce stack usage by allocating LLSModel in context. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-11-23 06:51:18 +01:00
Lukasz Marek
f87a34486a lavc/libvorbisdec: use better error codes 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-11-23 03:33:00 +01:00
Lukasz Marek
bceabbdaba lavc/libvorbisdec: fix mem leak in case of init failure 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-11-23 03:33:00 +01:00
Lukasz Marek
969382162f lavc/smacker: fix mem leak in case of init failure 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-11-23 03:25:34 +01:00
Lukasz Marek
691f9be622 lavc/anm: fix mem leak in case of init failure 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-11-23 03:25:25 +01:00
Michael Niedermayer
65ce8f8895 avcodec/x86/Makefile: fix order 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-23 01:49:04 +01:00
Michael Niedermayer
9f0fd17c61 Merge commit 'f856d9c2f314c493c672dfb9c876da182525da3d' 
* commit 'f856d9c2f314c493c672dfb9c876da182525da3d':
  dashenc: Don't require the stream bitrate to be known

Conflicts:
	libavformat/dashenc.c

See: 5f8fcdd448
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-23 01:34:05 +01:00
Michael Niedermayer
6d8dda1693 Merge commit 'eec7f032a903e06d249d1e8aa6630b65292bf40f' 
* commit 'eec7f032a903e06d249d1e8aa6630b65292bf40f':
  lavf: Remove a redundant include of sys/stat.h

Conflicts:
	libavformat/os_support.h

See: 49515cb840
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-23 01:18:51 +01:00
Michael Niedermayer
d899ea2017 Merge commit '4b68edd08ac352e314ae3fc701f90b081e549324' 
* commit '4b68edd08ac352e314ae3fc701f90b081e549324':
  flvenc: Remove an unused variable

See: cc5f731541
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-23 01:16:32 +01:00
Matthew Oliver
293fee4bc2 libavcodec/tiff: Fix static linking of lzma with msvc. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-22 22:12:19 +01:00
Martin Storsjö
f856d9c2f3 dashenc: Don't require the stream bitrate to be known 
Don't write any bitrate attribute if it isn't known. As long as one
doesn't want automatic bitrate switching, playback can work just
fine even if it isn't set.

If strict standard compliance is requested, this is still considered
an error, since the attribute is mandatory according to the spec.

Based on a patch by Rodger Combs.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-11-22 22:16:37 +02:00
Martin Storsjö
eec7f032a9 lavf: Remove a redundant include of sys/stat.h 
The same file already includes this header a few lines further
above.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-11-22 22:11:44 +02:00
Michael Niedermayer
4b68edd08a flvenc: Remove an unused variable 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-11-22 22:10:52 +02:00
Michael Niedermayer
d3512a0e89 avcodec/x86/lossless_audiodsp: fix fallback code for 32bit 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-22 21:08:38 +01:00
Michael Niedermayer
ce6141259b avcodec/wmalosslessdec: support 24bit lossless 
Not checked if its actually lossless
Fixes Ticket1847

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-22 20:51:15 +01:00
Michael Niedermayer
4327088da3 avcodec/x86/lossless_audiodsp: support len %16 == 8 in scalarproduct_and_madd_int16() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-22 20:40:36 +01:00
Michael Niedermayer
2f6550bb9a avcodec/mjpegdec: fix pixfmtid 0x14111100 
Fixes part of Ticket 2004
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-22 19:38:43 +01:00
Reimar Döffinger
8437cc7206 ffv1dec: Avoid unnecessarily large stack usage and copies. 
Ideally the compiler could figure this out on its own,
but it seems it can't.
An alternative that would avoid the messy explicit memcpy
would be to use a sub-struct for the parts that should
be preserved, which can then simply be assigned.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-11-22 19:06:12 +01:00
Michael Niedermayer
9146a47600 avfilter/graphparser: Use av_freep(), avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-22 18:56:37 +01:00
Michael Niedermayer
7df2981f04 avfilter/avf_concat: Use av_freep(), avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-22 18:47:26 +01:00
Michael Niedermayer
8e6a44cfc5 avdevice/iec61883: Use av_freep(), avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-22 18:44:35 +01:00
Benoit Fouet
90c9b49405 ffplay: fix mem leak when opening input or parsing options fail. 
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-22 15:55:07 +01:00
Michael Niedermayer
0b9a9e0e2c avcodec/libspeexdec: make array const 
Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-22 14:10:47 +01:00
Reimar Döffinger
33fc1ccb49 h264_mb: Use smaller data type for refs in await_references. 
As far as I can tell the value can never go outside
the int16_t type.
And especially the cost of the initialization is
reduced quite a bit by making it smaller.
Overall decoding speedup not measurable though.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-11-22 14:06:48 +01:00
Reimar Döffinger
478c61ccb2 h264_i386: Optimize decode_significance_8x8_x86 for 64 bit. 
11674 -> 10877 decicycles on my Phenom II.
Overall speedup was unfortunately within measurement error.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-11-22 14:06:48 +01:00
Reimar Döffinger
c2c27e9e51 indeo2: move variable declarations into blocks using them. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-11-22 14:06:48 +01:00
Reimar Döffinger
79be253635 mxfdec: minor simplification. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-11-22 14:06:48 +01:00
Matthew Oliver
3bedd72a9e lavf: fix apngdec under msvc. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-22 13:20:34 +01:00
James Almer
14b9302f5f lavf/apngdec: properly skip currently unsupported in-stream tags 
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-22 13:14:28 +01:00
Mark Reid
08d81d0a01 libavformat/mxfdec.c: export source package uids and names as metadata 
Changes since v1:
* renamed mxf_read_source_package -> mxf_read_package

v1 reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-22 03:35:02 +01:00
Michael Niedermayer
230aeee94c doc: fix the the typos 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-22 02:09:09 +01:00
TOYAMA Shin-ichi
e01acd868b doc/decoders.texi: typo in description for option ifo_palette 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-22 02:07:01 +01:00
Michael Niedermayer
148506c965 Merge commit 'cd975d5658a1cbe99939df75db59d5ae9fbcb4e0' 
* commit 'cd975d5658a1cbe99939df75db59d5ae9fbcb4e0':
  hevc: Spin the mv_mpv_mode calls in a stand alone function

Conflicts:
	libavcodec/hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-22 01:32:55 +01:00
Michael Niedermayer
70e3fae88d Merge commit '1f80742f49a9a4e846c9f099387881abc87150b2' 
* commit '1f80742f49a9a4e846c9f099387881abc87150b2':
  qdm2: avoid integer overflow

See: ccfd8cffe8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 23:46:17 +01:00
Michael Niedermayer
a82f3de053 Merge commit '312daa15891dc7abb77a404fe927d5ee35c52a71' 
* commit '312daa15891dc7abb77a404fe927d5ee35c52a71':
  vp9: Use the correct upper bound for seg_id

Conflicts:
	libavcodec/vp9.h
	libavcodec/vp9block.c

Not merged, the value was correct before as far as i can see

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 23:37:04 +01:00
Luca Barbato
cd975d5658 hevc: Spin the mv_mpv_mode calls in a stand alone function 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-11-21 23:17:37 +01:00
Michael Niedermayer
ac967ad872 Merge commit 'd466d82faaf6e0e57a3a4be5e38e3902ef251ac3' 
* commit 'd466d82faaf6e0e57a3a4be5e38e3902ef251ac3':
  dvdsubdec: Do not leak on failure path

Conflicts:
	libavcodec/dvdsubdec.c

See: 7fa9f7ef1c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 22:36:01 +01:00
Michael Niedermayer
ad2424e6b2 Merge commit 'a42d5c861fea8d18d997c6ba3f4a1d8aa95a288b' 
* commit 'a42d5c861fea8d18d997c6ba3f4a1d8aa95a288b':
  libtwolame: prevent a NULL pointer dereference

See: a586b3d9b1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 22:26:15 +01:00
Michael Niedermayer
b9ffafbfcc avfilter/formats: Alloc NULL fmts in SET_COMMON_FORMATS() 
This avoids null pointer dereferences in case memory allocation has failed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 22:15:32 +01:00
Michael Niedermayer
75819fafd8 avfilter/formats: free the correct pointer in ADD_FORMAT() 
Also only free it when it was not previously allocated to return to the
state prior to the failing function call

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 22:13:44 +01:00
Michael Niedermayer
42f3cb419a Merge commit '863ee8a855b8ce27ffef41479eb66da58763faed' 
* commit '863ee8a855b8ce27ffef41479eb66da58763faed':
  lavfi: clean memory on error in ADD_FORMAT()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 22:12:46 +01:00