Michael Niedermayer
c79c7ffc9d
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avienc: drop the vfr flag.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
9c52ab6f4f
ffmpeg: treat avi as VFR in framerate conversion code
...
It can be debated if avi is vfr or cfr, it can be either depending
on the definition of vfr and cfr.
This commit ensures that avi is treated correctly independent of
the AVFMT_VARIABLE_FPS value.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
ac4447b6ec
Merge commit '5462dde1947e0ecfcb2db99ae29ce9dee8933b45'
...
* commit '5462dde1947e0ecfcb2db99ae29ce9dee8933b45':
metasound: Fix error message argument
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
a26e83da6c
avformat/mxfdec: optimize probing
...
about 71 times faster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
6b4f58d448
tools/probetest: also print the time the probe functions needed
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
32584667ea
tools/probetest: use named constant for the maximum number of formats
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Anton Khirnov
d42db44cfe
avienc: drop the vfr flag.
...
AVI does not really support vfr properly, only by padding with null
packets.
11 years ago
Paul B Mahol
b8f276e645
avcodec/mimic: use av_freep() and reset swap_buf_size
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Paul B Mahol
2145e8f193
avcodec/vmdav: use av_freep() and reset unpack_buffer_size
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Michael Niedermayer
4f0e85517f
avformat/icodec: reduce score returned on probing
...
The ico probe function is pretty weak just checking a few bytes for being 0, 1 or not 0
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
e93523a06f
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
h263dsp: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
a30f7918b5
Merge commit '0338c396987c82b41d322630ea9712fe5f9561d6'
...
* commit '0338c396987c82b41d322630ea9712fe5f9561d6':
dsputil: Split off H.263 bits into their own H263DSPContext
Conflicts:
configure
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
f8a9cf7704
avformat/lvfdec: check stream count during probing
...
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Kostya Shishkov
5462dde194
metasound: Fix error message argument
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
11 years ago
Michael Niedermayer
4c439f6e39
avformat/idcin: check the decompressed frame size during probing
...
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Diego Biurrun
cb56c3961b
h263dsp: K&R formatting cosmetics
...
Also remove array element numbering comments.
11 years ago
Diego Biurrun
0338c39698
dsputil: Split off H.263 bits into their own H263DSPContext
11 years ago
Hendrik Leppkes
019247bdc3
avformat/mov: only force parsing for video tracks if stss is empty
...
Fixes playback of some AAC streams, which are otherwise mangled by the
parser, and stss is typically only valid for video anyway.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
b7fea3daab
libavcodec/dvdsubdec: remove exit() call in debug code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
48f37664a8
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Remove #undefs for formerly forbidden system functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
175e689cc5
avfilter/graphparser: zero filter_ctx in case of deallocation in create_filter()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
ec8e68c763
Merge commit 'cffecc0e7ebd642afaa1fb9f56fab1fcc283293c'
...
* commit 'cffecc0e7ebd642afaa1fb9f56fab1fcc283293c':
avfilter/graphparser: Directly free filter memory if initialization fails
Conflicts:
libavfilter/graphparser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Lenny Wang
7c02a77d25
avfilter/unsharp: added optimized opencl kernels
...
Reviewed-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Dave Yeo
f9c6044a6f
Fix compilation with os2threads
...
Signed-off-by: Dave Yeo <daveryeo@telus.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
3836af4765
avformat/mpegvideodec: check seq headers more completely during probing
...
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Clément Bœsch
3bcd5c1e31
avformat/img2enc: simplify split planes extension selection.
11 years ago
Clément Bœsch
3e036d407d
doc/muxers: document animated GIF muxer.
11 years ago
Clément Bœsch
c37b0daf33
avformat/gif: fix final_delay unit in documentation.
11 years ago
Clément Bœsch
3c5e6e7635
avformat/img2enc: reindent after previous commit.
11 years ago
Clément Bœsch
f70db22999
avformat/image2: allow muxing gif files.
...
Fixes Ticket #2936 .
11 years ago
Paul B Mahol
d9d752cfb5
avfilter/af_aecho: free input frame after it is being used
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Paul B Mahol
9521236881
avcodec/libfdk-aacdec: remove redundant log messages
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Paul B Mahol
315e3cf047
avcodec/hnm4video: remove redundant log message
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Michael Niedermayer
cbe84b4ffa
avformat/astdec: sanity check channels & sample rate
...
Fixes probetest failure
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
kowalsky
4684539c91
avformat/hls: fixed bug where custom http headers weren't kept for hls streams
...
See: https://trac.ffmpeg.org/ticket/3024
11 years ago
Diego Biurrun
86f910806b
Remove #undefs for formerly forbidden system functions
...
The macros forbidding the system functions no longer exist, obviating
the need for the #undefs.
11 years ago
Michael Niedermayer
ea6331b2c6
avfilter/af_aresample: Calculate output buffer size more precisely.
...
Fixes accumulation of data in case of significant silence injections
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Diego Biurrun
cffecc0e7e
avfilter/graphparser: Directly free filter memory if initialization fails
11 years ago
Michael Niedermayer
3e6b7bbce5
avformat/segafilm: check 2nd tag
...
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
ff1d81b08c
avformat/swfdec: check version and size during probing
...
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
7b7697646b
avformat/rsd: increase probe score, as misdetections are fixed
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
50a3c4c5d2
avformat/rsd: Check channels and sample_rate fields
...
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
a35e30b672
avformat/libgme: decrease score by 1, fixes probetest failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
1b3d3a9c87
Merge remote-tracking branch 'cus/stable'
...
* cus/stable:
ffplay: add smarter method for determining video picture duration
ffplay: add frame duration estimated from frame rate to VideoPicture
ffplay: avoid code duplication in AVFILTER enabled and disabled case
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
66872161cb
avutil/common: error out with clear message if __STDC_CONSTANT_MACROS is not defined with c++
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
6cfaf9cde8
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
configure: Move -Wno-maybe-uninitialized check into gcc section
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Marton Balint
5ecfcc7dff
ffplay: add smarter method for determining video picture duration
...
- consider it an invalid PTS when the next PTS value is the same as the current one
- in case of invalid or unknown PTS, return vp->duration
This fixes ffplay part of ticket #3005 .
Signed-off-by: Marton Balint <cus@passwd.hu>
11 years ago
Marton Balint
61dd319770
ffplay: add frame duration estimated from frame rate to VideoPicture
...
Signed-off-by: Marton Balint <cus@passwd.hu>
11 years ago
Marton Balint
105d4748cf
ffplay: avoid code duplication in AVFILTER enabled and disabled case
...
Signed-off-by: Marton Balint <cus@passwd.hu>
11 years ago
Clément Bœsch
87434cf373
avcodec/vp9: add ff_vp9_idct_idct_{4x4,8x8}_ssse3().
...
1789 decicycles in idct_idct_4x4_add_c, 262136 runs, 8 skips
1839 decicycles in idct_idct_4x4_add_c, 524270 runs, 18 skips
1864 decicycles in idct_idct_4x4_add_c, 1048548 runs, 28 skips
529 decicycles in ff_vp9_idct_idct_4x4_add_ssse3, 262138 runs, 6 skips
516 decicycles in ff_vp9_idct_idct_4x4_add_ssse3, 524282 runs, 6 skips
474 decicycles in ff_vp9_idct_idct_4x4_add_ssse3, 1048565 runs, 11 skips
(~3.9x faster)
7726 decicycles in idct_idct_8x8_add_c, 1048433 runs, 143 skips
7732 decicycles in idct_idct_8x8_add_c, 2096882 runs, 270 skips
7731 decicycles in idct_idct_8x8_add_c, 4193772 runs, 532 skips
1145 decicycles in ff_vp9_idct_idct_8x8_add_ssse3, 1048549 runs, 27 skips
1137 decicycles in ff_vp9_idct_idct_8x8_add_ssse3, 2097097 runs, 55 skips
1086 decicycles in ff_vp9_idct_idct_8x8_add_ssse3, 4194188 runs, 116 skips
(~7.1x faster)
Overall decode time before commit:
16.48s user 0.03s system 99% cpu 16.526 total
16.54s user 0.01s system 99% cpu 16.566 total
16.46s user 0.03s system 99% cpu 16.511 total
Overall decode time after commit:
16.34s user 0.02s system 99% cpu 16.378 total
16.28s user 0.02s system 99% cpu 16.315 total
16.32s user 0.03s system 99% cpu 16.366 total
Tested on i7 920 with 40s 1080p footage.
11 years ago