]>
git.sesse.net Git - ffmpeg/log
Carl Eugen Hoyos [Mon, 28 May 2012 13:58:46 +0000 (15:58 +0200)]
Test extradata size before reading from extradata when decoding avui.
Michael Niedermayer [Mon, 28 May 2012 13:44:11 +0000 (15:44 +0200)]
configure: fix the wording for gpl incompatible licenses warnings
calling the 4 clause BSD license non free is quite a stretch ;)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 28 May 2012 13:36:35 +0000 (15:36 +0200)]
configure: openssl is compatible with the LGPL.
looking at the license i cannot see why they would be incompatible and
researching this matter a bit also turned up no reasons.
If i missed something, please dont hesitate to flame me and or revert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 27 May 2012 22:15:14 +0000 (00:15 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avprobe: restore pseudo-INI old style format for compatibility.
avprobe: fix formatting.
log: make colored output more colorful.
rtsp: Check for dynamic payload handlers if no static payload mapping was found
Conflicts:
Changelog
doc/ffprobe.texi
ffprobe.c
libavutil/log.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 27 May 2012 20:45:52 +0000 (22:45 +0200)]
avienc: create xsub in avi files that are closer to whats in the wild
Fixes ticket1332
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 27 May 2012 14:04:05 +0000 (16:04 +0200)]
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: force exit when filter configuration fails
ffplay: fix stream cycling if audio decoding fails
ffplay: flush codec buffers before freeing filters
ffplay: dont destroy packet queues on stream change
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 27 May 2012 13:34:47 +0000 (15:34 +0200)]
tests and tools: cleanup ffmpeg reference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vitor Sessak [Sun, 27 May 2012 10:17:28 +0000 (12:17 +0200)]
x86: use new schema for ASM macros
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 27 May 2012 09:50:38 +0000 (11:50 +0200)]
mxfdec: remove unused last_index_duration
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sun, 27 May 2012 13:28:15 +0000 (15:28 +0200)]
Changelog: fix wrong/inaccurate entries.
Carl Eugen Hoyos [Sat, 26 May 2012 23:13:37 +0000 (01:13 +0200)]
Support decoding fourcc YVYU.
Based on work by ami_stuff.
Fixes ticket #1352
Clément Bœsch [Sat, 26 May 2012 22:34:09 +0000 (00:34 +0200)]
lavfi/deshake: add libavcodec dependency (dsputil).
Clément Bœsch [Fri, 25 May 2012 23:27:19 +0000 (01:27 +0200)]
ffprobe: reduce the number of AVBPrint resets.
Michael Niedermayer [Sat, 26 May 2012 20:37:37 +0000 (22:37 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
opt: Add av_opt_set_bin()
avconv: Display the error returned by avformat_write_header
rtpenc_chain: Return an error code instead of just a plain pointer
rtpenc_chain: Free the URLContext on failure
rtpenc: Expose the ssrc as an avoption
avprobe: display the codec profile in show_stream()
avprobe: fix function prototype
cosmetics: Fix indentation
avprobe: changelog entry
avprobe: update documentation
avprobe: provide JSON output
avprobe: output proper INI format
avprobe: improve formatting
rtmp: fix url parsing
fate: document TARGET_EXEC and its usage
Conflicts:
doc/APIchanges
doc/fate.texi
doc/ffprobe.texi
ffprobe.c
libavformat/version.h
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Sat, 26 May 2012 06:54:25 +0000 (08:54 +0200)]
avprobe: restore pseudo-INI old style format for compatibility.
Anton Khirnov [Sat, 26 May 2012 06:52:19 +0000 (08:52 +0200)]
avprobe: fix formatting.
Anton Khirnov [Sat, 26 May 2012 06:24:14 +0000 (08:24 +0200)]
log: make colored output more colorful.
Green for verbose, cyan for debug.
Michael Niedermayer [Sat, 26 May 2012 19:03:58 +0000 (21:03 +0200)]
aacdec: fix "may be used uninitialized" warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 26 May 2012 18:59:57 +0000 (20:59 +0200)]
aacpsy: fix "may be used uninitialized" warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Thu, 8 Dec 2011 13:19:58 +0000 (15:19 +0200)]
rtsp: Check for dynamic payload handlers if no static payload mapping was found
Some systems abuse the static payload types 35 or 36 (which
according to IANA are unassigned) for H264.
Signed-off-by: Martin Storsjö <martin@martin.st>
Alexis Ballier [Sat, 26 May 2012 18:06:12 +0000 (14:06 -0400)]
Fix tests without fate samples.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 26 May 2012 18:04:19 +0000 (20:04 +0200)]
avio: fix "discards const qualifier from pointer target type" warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 26 May 2012 17:54:27 +0000 (19:54 +0200)]
lswsutils: fix "ncompatible pointer type" warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 26 May 2012 17:50:05 +0000 (19:50 +0200)]
lavfutils: fix incompatible pointer type warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 26 May 2012 14:17:47 +0000 (16:17 +0200)]
af_aresample: fix pts, they where off by a packet in the -async >0 case.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Samuel Pitoiset [Fri, 25 May 2012 10:32:39 +0000 (12:32 +0200)]
opt: Add av_opt_set_bin()
Introduce a new function to set binary data through AVOption,
avoiding having to convert the binary data to a string inbetween.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Sat, 26 May 2012 01:08:44 +0000 (03:08 +0200)]
Changelog, spell out the CVEs that where fixed.
there are some holes in the list as some things have been fixed
in previous releases already.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christian Schmidt [Fri, 25 May 2012 13:01:59 +0000 (15:01 +0200)]
ffprobe: display the codec profile in show_stream()
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Martin Storsjö [Fri, 25 May 2012 21:55:56 +0000 (00:55 +0300)]
avconv: Display the error returned by avformat_write_header
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 25 May 2012 19:26:00 +0000 (22:26 +0300)]
rtpenc_chain: Return an error code instead of just a plain pointer
Also check the return value in sapenc.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 25 May 2012 21:40:54 +0000 (00:40 +0300)]
rtpenc_chain: Free the URLContext on failure
If an URLContext is passed in, its ownership is given to this
function, and is either owned by the returned AVFormatContext
on a successful return, or freed on failure.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 25 May 2012 21:18:01 +0000 (00:18 +0300)]
rtpenc: Expose the ssrc as an avoption
This allows the caller to set it, and allows the caller to query
what it was set to.
Signed-off-by: Martin Storsjö <martin@martin.st>
Stefano Sabatini [Sat, 26 May 2012 10:02:30 +0000 (12:02 +0200)]
tests/lavfi: use do_lavfi_pixfmts for the pixdesctest test
Simplify, and as a side effect extend the number of supported formats, in
particular add a test for pal8.
Stefano Sabatini [Sat, 26 May 2012 08:45:48 +0000 (10:45 +0200)]
tests/lavfi: rework lavfi-regression.sh, avoid use of ffmpeg -pix_fmts
Use lavfi-showfiltfmts for checking the format supported by the scale
filter instead. The advantage is that the scale filter may support
formats which are not supported by libswscale (namely: the pal8 format).
The new implementation is also a bit cleaner, because it doesn't depend
on the ffmpeg output.
Michael Niedermayer [Sat, 26 May 2012 00:33:38 +0000 (02:33 +0200)]
swr: fix swr_drop_output()
Fixes part of Ticket1341
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 26 May 2012 00:28:40 +0000 (02:28 +0200)]
af_aresample: fix request_frame()
Fixes part of Ticket1341
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christian Schmidt [Fri, 25 May 2012 22:34:12 +0000 (15:34 -0700)]
avprobe: display the codec profile in show_stream()
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Fri, 25 May 2012 22:19:50 +0000 (15:19 -0700)]
avprobe: fix function prototype
Make opt_output_format return the correct value.
ami_stuff [Fri, 25 May 2012 22:13:44 +0000 (00:13 +0200)]
Support some BOXX codecs.
Fixes a part of ticket #1352.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Fri, 25 May 2012 19:16:06 +0000 (22:16 +0300)]
cosmetics: Fix indentation
Signed-off-by: Martin Storsjö <martin@martin.st>
Luca Barbato [Fri, 25 May 2012 19:58:58 +0000 (12:58 -0700)]
avprobe: changelog entry
Luca Barbato [Fri, 25 May 2012 19:57:36 +0000 (12:57 -0700)]
avprobe: update documentation
Update the documentation according to the latest changes
Luca Barbato [Thu, 24 May 2012 19:22:29 +0000 (12:22 -0700)]
avprobe: provide JSON output
JSON usage is quite widespread.
Luca Barbato [Fri, 18 May 2012 01:02:57 +0000 (18:02 -0700)]
avprobe: output proper INI format
Make the output valid INI serialization.
Luca Barbato [Fri, 25 May 2012 18:47:06 +0000 (11:47 -0700)]
avprobe: improve formatting
Do not use decimals if not needed.
Luca Barbato [Tue, 15 May 2012 00:24:27 +0000 (17:24 -0700)]
rtmp: fix url parsing
The application component can have a subcomponent to specify the
application instance even if it doesn't have a ":" in the playpath.
Luca Barbato [Mon, 14 May 2012 22:44:30 +0000 (15:44 -0700)]
fate: document TARGET_EXEC and its usage
TARGET_EXEC allows running FATE on simulators, remote targets and
memory checkers. Also document a known issue with Wine and mixed
Unix/Windows line ending.
Michael Niedermayer [Fri, 25 May 2012 18:48:50 +0000 (20:48 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
movenc: Don't write the 'wave' atom or its child 'enda' for lpcm audio.
imc: some cosmetics
rtmp: Pass the proper return code in rtmp_handshake
rtmp: Check return codes of net IO operations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Alex Converse [Wed, 23 May 2012 18:32:52 +0000 (11:32 -0700)]
movenc: Don't write the 'wave' atom or its child 'enda' for lpcm audio.
It's left over from stsd v0. QuickTime 7 no longer writes 'wave' or 'enda'
when 'lpcm' is the audio tag.
Kostya Shishkov [Tue, 22 May 2012 17:45:00 +0000 (19:45 +0200)]
imc: some cosmetics
Michael Niedermayer [Fri, 25 May 2012 16:54:01 +0000 (18:54 +0200)]
libavfilter: export ff_default_query_formats()
Its needed for fate on shared versioned .so
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 25 May 2012 15:27:40 +0000 (17:27 +0200)]
release_notes: update
Note, if you want something mentioned in the release notes for 0.11
push it but be real quick ...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 25 May 2012 10:35:42 +0000 (12:35 +0200)]
Revert "removing lowres support"
There have been multiple user complaints about loosing this feature
while its not clear the 3% speedloss claims where real or fabricated.
My own testing indicates no statistically significant speed difference
both with mpeg2 and mpeg4, and if at all the code with lowres support
is a tiny bit faster than without.
This reverts commit
92ef4be4ab9fbb7d901b22e0036a4ca90b00a476 , reversing
changes made to
2e07f42957666df6d7c63a62263b8447e97b1442 .
Conflicts:
cmdutils.c
libavcodec/arm/vp8dsp_init_arm.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavutil/arm/Makefile
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 25 May 2012 10:22:21 +0000 (12:22 +0200)]
avdevice: bump soname due to lavf soname bump
avdevice is just a part of lavf and uses lavf API/ABI/structures
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Fri, 25 May 2012 09:16:40 +0000 (11:16 +0200)]
lavfi/pixdesctest: use AVPALETTE_SIZE macro
Stefano Sabatini [Fri, 25 May 2012 01:03:38 +0000 (03:03 +0200)]
lavfi/pixdesctest: fix SAME -> SAME memcpy
Fix pixdesctest output with pal8 input.
X-Cola-Count: +(10+i*PI)l
Stefano Sabatini [Sat, 7 Apr 2012 07:57:07 +0000 (09:57 +0200)]
lavfi/hflip: copy palette data in start_frame()
Fix trac ticket #1116.
Clément Bœsch [Thu, 24 May 2012 22:07:40 +0000 (00:07 +0200)]
lavfi/aresample: print channel layouts and formats along with the rate.
Michael Bradshaw [Wed, 16 May 2012 17:39:20 +0000 (11:39 -0600)]
Fixed warnings about int64 to int32 conversion
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 24 May 2012 22:38:16 +0000 (00:38 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtmp: Return a proper error code instead of -1
rtmp: Check malloc calls
rtmp: Check ff_rtmp_packet_create calls
lavfi: add audio mix filter
flvdec: Make sure sample_rate is set to the updated value
tqi: Pass errors from the MB decoder
Conflicts:
Changelog
doc/filters.texi
libavcodec/eatqi.c
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Thu, 24 May 2012 21:55:17 +0000 (23:55 +0200)]
doc/filters: move "aformat" before "amerge".
Clément Bœsch [Thu, 24 May 2012 21:54:04 +0000 (23:54 +0200)]
doc/filters: remove old aformat entry.
The new description is still available below.
Marton Balint [Mon, 21 May 2012 22:10:03 +0000 (00:10 +0200)]
ffplay: force exit when filter configuration fails
Switching to visualization instead of exiting ffplay is a bit more tricky, so
just exit for now.
Fixes ticket 38.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Mon, 21 May 2012 21:33:41 +0000 (23:33 +0200)]
ffplay: fix stream cycling if audio decoding fails
Fixes ticket 1161.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Thu, 24 May 2012 21:22:59 +0000 (23:22 +0200)]
ffplay: flush codec buffers before freeing filters
We do this to ensure that input_get_buffer is not called from a
frame_worker_thread of a multithreaded decoder when we already freed the
filters.
Fixes occasional segfaults on video stream change.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Wed, 23 May 2012 23:56:28 +0000 (01:56 +0200)]
ffplay: dont destroy packet queues on stream change
This fixes occasional segfaults caused by lock request of the packet queue from
the reader thread.
Also don't allow to put frames into the queue when it's aborted, and don't try
to fill the queue with frames when it is aborted.
Signed-off-by: Marton Balint <cus@passwd.hu>
Clément Bœsch [Thu, 24 May 2012 21:46:15 +0000 (23:46 +0200)]
lavfi/video: add avfilter.h include to fix make checkheaders.
Clément Bœsch [Sat, 19 May 2012 18:08:25 +0000 (20:08 +0200)]
ffmpeg: use AUTO_INSERT_FILTER() for -async option.
Michael Niedermayer [Thu, 24 May 2012 19:27:01 +0000 (21:27 +0200)]
Changelog: update for 0.11
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Samuel Pitoiset [Thu, 24 May 2012 11:48:42 +0000 (13:48 +0200)]
rtmp: Pass the proper return code in rtmp_handshake
Signed-off-by: Martin Storsjö <martin@martin.st>
Samuel Pitoiset [Thu, 24 May 2012 11:48:25 +0000 (13:48 +0200)]
rtmp: Check return codes of net IO operations
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Thu, 24 May 2012 19:15:01 +0000 (21:15 +0200)]
MAINTAINERS: update versions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 24 May 2012 19:07:14 +0000 (21:07 +0200)]
doc: remove ffmpeg-mt-authorship.txt from master (for upcoming 0.11)
This lists git history, which is better kept in the history itself
that is both ours as this file as well as the actual history of the
ffmpeg-mt project.
If someone thinks this is not ok, drop me a mail and ill put it back!
Also note this file was not carried in our previous release with noone
complaining
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 24 May 2012 16:40:49 +0000 (18:40 +0200)]
ffplay: set base in dr1 allocation.
This matches the default non dr1 allocator
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Kyle [Thu, 24 May 2012 11:59:33 +0000 (13:59 +0200)]
dshow: rename dshow.h to avoid conflict with system header of equal name
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 24 May 2012 12:11:50 +0000 (14:11 +0200)]
fate: update checksum after pal8 changes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 24 May 2012 10:26:31 +0000 (12:26 +0200)]
Build the aformat filter when ffmpeg is built.
Carl Eugen Hoyos [Thu, 24 May 2012 06:14:48 +0000 (08:14 +0200)]
Do not disable ffmpeg with --disable-everything.
Carl Eugen Hoyos [Thu, 24 May 2012 06:08:31 +0000 (08:08 +0200)]
Fix compilation with --disable-everything.
Michael Niedermayer [Tue, 22 May 2012 19:47:34 +0000 (21:47 +0200)]
lavfutils: fix copyright
git blame:
77 Stefano Sabatini
1 Michael Niedermayer
Initial commit:
commit
2f83681c79a7419bec14ed6f40bf3a69b5dd16c2
Author: Stefano Sabatini <stefasab@gmail.com>
Date: Sat Mar 10 14:01:28 2012 +0100
lavfi: port libmpcodecs remove-logo filter
The code is based on the remove-logo filter in MPlayer/libmpcodecs, by
Robert Edele, relicensed to LGPL with consent of the author.
Address trac issue #249.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 22 May 2012 19:44:31 +0000 (21:44 +0200)]
lavfi/video: fix copyright
git blame:
132 Stefano Sabatini
77 Vitor Sessak
49 Michael Niedermayer
24 Anton Khirnov
22 S.N. Hemanth Meenakshisundaram
13 Bobby Bingham
7 Luca Barbato
2 Nicolas George
2 Alex Converse
1 Diego Elio Pettenò
Initial commit not traced as this file was split out.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 22 May 2012 19:36:30 +0000 (21:36 +0200)]
drawutils: fix copyright
git blame:
423 Nicolas George
86 Stefano Sabatini
19 Michael Niedermayer
1 Reimar Döffinger
Initial commit:
commit
bcfd9e821b6083e9a98b8e5da4de0a4fbf22923b
Author: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date: Sun Feb 20 23:42:17 2011 +0100
lavfi: add drawutils
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 22 May 2012 19:29:24 +0000 (21:29 +0200)]
vf_fps: fix copyright
Only commit:
commit
54c5dd89e3125c1f363fe8f95d2837a796967c6e
Author: Anton Khirnov <anton@khirnov.net>
Date: Wed May 9 14:08:21 2012 +0200
lavfi: Add fps filter.
Partially based on a patch by Robert Nagy <ronag89@gmail.com>
also see [FFmpeg-devel] [PATCH 07/10] vf_fps: fix copyright
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 22 May 2012 19:27:54 +0000 (21:27 +0200)]
vf_fps: license cleanup
The original patch was sent with FFmpeg in the license header.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 22 May 2012 19:19:24 +0000 (21:19 +0200)]
lavfi/buffer.c: fix copyright
git blame:
75 Anton Khirnov
72 Michael Niedermayer
39 Stefano Sabatini
23 S.N. Hemanth Meenakshisundaram
9 Vitor Sessak
6 Robert Nagy
2 Diego Biurrun
1 Andrey Utkin
Note:
commit
ab165047a6142ca0c8c333c36f4ebb96477622d7
Author: Anton Khirnov <anton@khirnov.net>
Date: Fri Apr 27 17:27:40 2012 +0200
lavfi: add a function for copying properties from AVFilterBufferRef->AVFrame
Based on a commit by Stefano Sabatini <stefano.sabatini-lala@poste.it>
commit
4a1ac8c43fcf526b249c3409f1ba54755143a224
Author: Anton Khirnov <anton@khirnov.net>
Date: Thu May 10 07:58:11 2012 +0200
lavfi: move buffer management function to a separate file.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 22 May 2012 19:04:31 +0000 (21:04 +0200)]
lavfi/avcodec.c: fix copyright
git blame:
45 Stefano Sabatini
23 Clément Bœsch
4 Michael Niedermayer
3 Robert Nagy
3 Nicolas George
2 Roger Pau Monné
Initial commit:
commit
566666caf3a09d6254edaa99d222eddb6fe2986b
Author: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date: Sun May 1 14:47:05 2011 +0200
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 22 May 2012 19:01:07 +0000 (21:01 +0200)]
asrc_anullsrc: fix copyright
git blame says:
109 Stefano Sabatini
7 Clément Bœsch
2 Reimar Döffinger
2 Michael Niedermayer
1 Reinhard Tartler
1 Mans Rullgard
Initial commit:
commit
1ee410f330d3b57b0ea1ccb915977f2ba4d99815
Author: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date: Sat Sep 25 01:56:58 2010 +0000
Add asrc_anullsrc - null audio source.
Based on a patch by "S.N. Hemanth Meenakshisundaram" smeenaks!ucsd!edu.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 22 May 2012 18:57:06 +0000 (20:57 +0200)]
asink_anullsink: fix copyright
git blame says authors are:
19 S.N. Hemanth Meenakshisundaram
2 Reimar Döffinger
initial commit:
commit
f0a5543898dad040b8f2d1b44fb6b278c06c3460
Author: S.N. Hemanth Meenakshisundaram <smeenaks@ucsd.edu>
Date: Sat Sep 25 01:57:01 2010 +0000
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 22 May 2012 18:50:43 +0000 (20:50 +0200)]
af_null: fix copyright
Authors according to blame are:
16 S.N. Hemanth Meenakshisundaram
4 Stefano Sabatini
3 Anton Khirnov
2 Reimar Döffinger
Initial commit was:
commit
99046339fca92d631404b47b041e98afa28659ed
Author: S.N. Hemanth Meenakshisundaram <smeenaks@ucsd.edu>
Date: Fri Aug 20 23:16:51 2010 +0000
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sat, 7 Apr 2012 07:49:39 +0000 (09:49 +0200)]
lavfi: copy palette in start_frame()
Fix -vf copy with pal8 format.
Stefano Sabatini [Tue, 10 Apr 2012 14:34:16 +0000 (16:34 +0200)]
lavu/pixfmt: move AVPALETTE_SIZE and _COUNT to pixfmt.h
Move AVPALETTE_SIZE and AVPALETTE_COUNT definition from
libavcodec/avcodec.h to libavutil/pixfmt.h.
The definition is more useful in libavutil, where it can be shared for
example by libavfilter and libswscale.
Samuel Pitoiset [Wed, 23 May 2012 16:55:52 +0000 (18:55 +0200)]
rtmp: Return a proper error code instead of -1
Signed-off-by: Martin Storsjö <martin@martin.st>
Samuel Pitoiset [Wed, 23 May 2012 16:55:34 +0000 (18:55 +0200)]
rtmp: Check malloc calls
Signed-off-by: Martin Storsjö <martin@martin.st>
Samuel Pitoiset [Wed, 23 May 2012 20:45:03 +0000 (22:45 +0200)]
rtmp: Check ff_rtmp_packet_create calls
Check malloc calls used by ff_rtmp_packet_create, unify error
handling and pass on error codes.
Signed-off-by: Martin Storsjö <martin@martin.st>
Justin Ruggles [Tue, 22 May 2012 01:27:59 +0000 (21:27 -0400)]
lavfi: add audio mix filter
Michael Niedermayer [Wed, 23 May 2012 19:41:13 +0000 (21:41 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
os_support: Define SHUT_RD, SHUT_WR and SHUT_RDWR on OS/2
http: Add support for reading http POST reply headers
http: Add http_shutdown() for ending writing of posts
tcp: Allow signalling end of reading/writing
avio: Add a function for signalling end of reading/writing
lavfi: fix comment, audio is supported now.
lavfi: fix incorrect comment.
lavfi: remove avfilter_null_* from public API on next bump.
lavfi: remove avfilter_default_* from public API on next bump.
lavfi: deprecate default config_props() callback and refactor avfilter_config_links()
avfiltergraph: smarter sample format selection.
avconv: rename transcode_audio/video to decode_audio/video.
asyncts: reset delta to 0 when it's not used.
x86: lavc: use %if HAVE_AVX guards around AVX functions in yasm code.
dwt: return errors from ff_slice_buffer_init()
Conflicts:
ffmpeg.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/formats.c
libavfilter/version.h
libavfilter/vf_blackframe.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_format.c
libavfilter/vf_showinfo.c
libavfilter/video.c
libavfilter/video.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Wed, 23 May 2012 13:28:25 +0000 (16:28 +0300)]
flvdec: Make sure sample_rate is set to the updated value
The sample_rate variable is used for checks for audio format
changes at the end of the function.
This fixes cases where the sample rate was set from the codec
id by flv_set_audio_codec (as for nellymoser 8 kHz/16 kHz),
so the value set to last_sample_rate wasn't equal to sample_rate
at this point. This caused the demuxer otherwise reports a spurious
change to 5512 Hz and back to the correct one.
Updating channels in the same way is only done for consistency.
Currently, flv_set_audio_codec doesn't update that value.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Mon, 19 Dec 2011 03:13:37 +0000 (04:13 +0100)]
tqi: Pass errors from the MB decoder
This silences some valgrind warnings.
CC: libav-stable@libav.org
Fixes second half of http://ffmpeg.org/trac/ffmpeg/ticket/794
Bug found by: Oana Stratulat
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit
f85334f58e1286287d0547a49fa9c93b40cbf48f )
Michael Niedermayer [Wed, 23 May 2012 16:46:01 +0000 (18:46 +0200)]
avidec: simplify avi_read_idx1()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 23 May 2012 16:42:27 +0000 (18:42 +0200)]
avidec: discard 0 packets even for sample_size==0 NI
Fixes Ticket1332
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>