Michael Niedermayer
c6b4258965
Merge commit '1eb932803037a3c9f98f66aeb80024dfa3c5c743'
...
* commit '1eb932803037a3c9f98f66aeb80024dfa3c5c743':
asfenc: add ASF_Reserved_4 as defined in section 10.10 of the ASF spec
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c6526620a9
Merge commit 'c53b5dda352452e79a9e962cd4c74c813186d9ed'
...
* commit 'c53b5dda352452e79a9e962cd4c74c813186d9ed':
asfdec: replace magic constant with DATA_HEADER_SIZE
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c16470d77a
Merge commit '5f408333601a827054335f309defcb246a532b21'
...
* commit '5f408333601a827054335f309defcb246a532b21':
asfdec: substract preroll time from marker presentation time
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Monty Montgomery
f6622f9610
avformat/matroskadec: correct spurious keyframe warnings in webm
...
Minor change to fix for Trac #1003 to avoid squawking about files
with valid keyframes that aren't marked (as opposed to frames that are
marked as keyframes and aren't).
Change correctly surpresses the spurious warnings, while still complaining
about (and handling) the genuinely broken file attached to bug #1003 .
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Paul B Mahol
3e2a5b33f0
avformat/matroskadec: use av_malloc_array() and check for allocation error
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Michael Niedermayer
13eff473ad
swscale/swscale_unscaled: fix alpha values for rgb/bgr -> RGB32_1 / BGR32_1
...
Found-by: Justin Ruggles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
1225b67fc9
avutil/frame: suppress "comparison of unsigned expression < 0 is always false" warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
9c8aeacf82
avutil: add av_get_colorspace_name()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
63139f62f3
avformat/bmv: remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Paul B Mahol
20101f4a83
avfilter/vf_decimate: add gray16 and yuv440p
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Paul B Mahol
0ad5ef674b
avfilter/vf_decimate: fix crash with gray8
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Vladimir Pantelic
1eb9328030
asfenc: add ASF_Reserved_4 as defined in section 10.10 of the ASF spec
...
Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
11 years ago
Vladimir Pantelic
c53b5dda35
asfdec: replace magic constant with DATA_HEADER_SIZE
...
Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
11 years ago
Vladimir Pantelic
5f40833360
asfdec: substract preroll time from marker presentation time
...
this was forgotten when we changed ASF to not output the preroll time
Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
11 years ago
Paul B Mahol
1f5d1342ea
doc: Add missing hashes and dates to APIChanges
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Paul B Mahol
390c35a13b
lavfi/mp: remove mp=qp
...
The filter does nothing.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Michael Niedermayer
ad2a08388c
avformat/concat: revert one hunk of 20dfab33f5
...
The deallocated memory contains resources that need to be freed before it
can be deallocated. The original code was correct.
This also fixes a double free
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
8be56e464b
avformat/smacker: Check if bufs has been allocated before use
...
Fixes null pointer dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
93648ee47b
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
rv34: Fix a memory leak on errors
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
52dc3600a9
Merge commit 'bcbe4f3ceb6ee0210d3a401963518906c8b9b230'
...
* commit 'bcbe4f3ceb6ee0210d3a401963518906c8b9b230':
idroqdec: Make sure a video stream has been allocated before returning packets
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
b4c88a4c4c
Merge commit '5372cda67109848d22146289e401669266217e80'
...
* commit '5372cda67109848d22146289e401669266217e80':
rv10: Validate the dimensions set from the container
This check could be replaced by a width==0||height==0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
374a2f4562
Merge commit 'ae0f316a4778e473d407cffa8392595ba0735153'
...
* commit 'ae0f316a4778e473d407cffa8392595ba0735153':
rtmp: Unbreak handle_notify
See: fbd54827b1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
32ea39f56d
Merge commit '1914e6f010b3320025c7b692aaea51d9b9a992a8'
...
* commit '1914e6f010b3320025c7b692aaea51d9b9a992a8':
aacdec: Add support for LD (Low Delay) AAC
Conflicts:
Changelog
libavcodec/aacdec.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
257f11820b
Merge commit '5cdefc02079a5b899bdec09e15e2bb099cb01734'
...
* commit '5cdefc02079a5b899bdec09e15e2bb099cb01734':
aacdec: Add support for Error Resilience syntax.
Conflicts:
Changelog
libavcodec/aacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
b26ccf218d
Merge commit 'c4bfa098072ba338d83555d6e2199f7e1e64ffff'
...
* commit 'c4bfa098072ba338d83555d6e2199f7e1e64ffff':
Add a WebP decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/version.h
libavformat/img2.c
The previously existing webp decoder is disabled as the new
one supports lossless mode and alpha while the previous does not.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
ac2fc63ac6
Merge commit '9ae53c5860e17d087642d27b00dade071970a2e7'
...
* commit '9ae53c5860e17d087642d27b00dade071970a2e7':
lavc: add ff_u8_to_s8() for safe type punning of uint8_t to int8_t
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Luca Barbato
fbd54827b1
rtmp: Unbreak handle_notify
...
Commit 5626f994f2
broke it.
11 years ago
Michael Niedermayer
20dfab33f5
Merge commit '5626f994f273af80fb100d4743b963304de9e05c'
...
* commit '5626f994f273af80fb100d4743b963304de9e05c':
avformat: Use av_reallocp() where suitable
Conflicts:
libavformat/avidec.c
libavformat/avienc.c
libavformat/aviobuf.c
libavformat/oggparsevorbis.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
f54d751f33
Merge commit '0f310a6f333b016d336674d086045e8473fdf918'
...
* commit '0f310a6f333b016d336674d086045e8473fdf918':
rmdec: Validate the fps value
Conflicts:
libavformat/rmdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Stefano Sabatini
f0606a28de
ffprobe: add -read_intervals option
...
This is also useful to test seeking on an input file.
This also addresses trac ticket #1437 .
11 years ago
Martin Storsjö
fdbd924b84
rv34: Fix a memory leak on errors
...
Signed-off-by: Martin Storsjö <martin@martin.st>
11 years ago
Martin Storsjö
bcbe4f3ceb
idroqdec: Make sure a video stream has been allocated before returning packets
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
11 years ago
Martin Storsjö
5372cda671
rv10: Validate the dimensions set from the container
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
11 years ago
Stefano Sabatini
6230a95659
doc/muxers: itemize tee examples
...
Improve rendering.
11 years ago
Luca Barbato
ae0f316a47
rtmp: Unbreak handle_notify
...
Commit 5626f994f2
broke it.
11 years ago
James Almer
ea70e2f2d7
matroskaenc: Write muxingapp and writingapp elements when using bitexact flag
...
Files won't validate with mkvalidtor if these two elements are missing.
Use a const "Lavf" string that wont change with library version bumps.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
James Almer
93439e8b6f
fate: Fix exif tests ffprobe dependency
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
James Almer
164e0e544f
doc/APIchanges: Fix two hashes
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Paul B Mahol
2e35686030
avfilter/vf_telecine: remove redudant av_frame_copy_props()
...
It is already called by av_frame_clone().
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Alex Converse
1914e6f010
aacdec: Add support for LD (Low Delay) AAC
11 years ago
Alex Converse
5cdefc0207
aacdec: Add support for Error Resilience syntax.
...
This does not add support for any error resilience tools.
11 years ago
Justin Ruggles
c4bfa09807
Add a WebP decoder
...
Container and lossy decoding by Aneesh Dogra <aneesh@sugarlabs.org>
Lossless decoding by Justin Ruggles <justin.ruggles@gmail.com>
11 years ago
Justin Ruggles
9ae53c5860
lavc: add ff_u8_to_s8() for safe type punning of uint8_t to int8_t
11 years ago
Alexandra Khirnova
5626f994f2
avformat: Use av_reallocp() where suitable
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
11 years ago
Paul B Mahol
7f4a5006ce
avfilter/vf_pullup: remove junk_down nonsense
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Paul B Mahol
d520055000
avfilter/vf_pullup: change log level to error
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Paul B Mahol
fe5b7612c0
avfilter/vf_pullup: fix memleak of metrics for last PullupField
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Michael Niedermayer
b7e7d8cdaf
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
movenc: Add an option for omitting the tfhd base offset
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Paul B Mahol
394a73cad2
avfilter/vf_pullup: make sure metric_plane is available
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Paul B Mahol
8302abf844
lavfi/mp: remove mp=pullup
...
The filter was ported to a native libavfilter filter.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago