Timothy Gu
e1ee0521a6
tests: Fix test name for pixfmts tests
2014-11-09 21:37:18 -08:00
Clément Bœsch
ff9b21776b
doc/filters: explicit and complete xBR documentation
2014-11-10 06:36:31 +01:00
Clément Bœsch
30466cac9d
avfilter/xbr: drop yet another x2 reference
2014-11-10 06:34:11 +01:00
Clément Bœsch
937ebb8435
avfilter/xbr: fix filter description field
2014-11-10 06:32:27 +01:00
Clément Bœsch
548a5f7ef6
avfilter/xbr: fix TODO entry
2014-11-10 06:28:44 +01:00
Clément Bœsch
fc0a91e3cd
avfilter/xbr: consistent use of @see
2014-11-10 06:26:45 +01:00
Clément Bœsch
ae65a84517
Changelog: explicit that xBR scaler is implemented as a filter
2014-11-10 06:24:54 +01:00
Michael Niedermayer
064a237669
avfilter/vf_xbr: Uppercase first letter of context type for consistency
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-10 03:45:00 +01:00
Arwa Arif
19d0949d31
lavfi: add xbr filter xBR
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-10 03:45:00 +01:00
Michael Niedermayer
f6a8c77afb
avcodec/utils: Fix warning: comparison between enum foo and enum bar [-Wenum-compare]
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-10 02:54:24 +01:00
Michael Niedermayer
9889b29ff4
avcodec/utils: make sidedata remapping table static const
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-10 02:53:21 +01:00
Martin Storsjö
b44a242c3d
libfdk-aacdec: Support building with the latest version of fdk-aac
...
The latest fdk-aac code drop (from android 5.0) changed the channel
layout enums (changing the value of existing enum constants), and
renamed the option for downmixing.
The failsafe comparison between ctype and FF_ARRAY_ELEMS(channel_counts)
can trigger warnings (-Wtautological-constant-out-of-range-compare)
when building with the old FDK AAC releases, where it can't be
out of range with the enum values used there.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-10 02:46:46 +01:00
Michael Niedermayer
715ccc2bc4
Merge commit '09f25533a564eab743f258d168697a11122914c4'
...
* commit '09f25533a564eab743f258d168697a11122914c4':
v4l2: Preserve errno values
Conflicts:
libavdevice/v4l2.c
See: 60950adc18
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-10 01:37:08 +01:00
Michael Niedermayer
d99653c9e4
Merge commit 'a1a259881fa7b23e2ffc0c2a43d4923fe42d0478'
...
* commit 'a1a259881fa7b23e2ffc0c2a43d4923fe42d0478':
v4l2: Use av_strerror
Conflicts:
libavdevice/v4l2.c
See: 60950adc18
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-10 01:19:24 +01:00
Michael Niedermayer
0960cc4cc6
Merge commit 'e3e317e0c015b164b6c2eb8913e393216d78de23'
...
* commit 'e3e317e0c015b164b6c2eb8913e393216d78de23':
lavc: Compact the side-data passthrough
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-10 00:57:41 +01:00
Kieran Kunhya
b546023b93
swscale: fix yuv2yuvX_8 assembly on x86
...
use_mmx_vfilter check/fix by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-09 23:52:17 +01:00
Carl Eugen Hoyos
e971eef8c0
Set -scan_all_pmts 1 in ffmpeg, ffplay and ffprobe if not set by user.
...
Fixes ticket #3762 .
2014-11-09 18:28:29 +01:00
Lukasz Marek
4e179436b6
lavu/opt: copy dict in av_opt_copy
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-11-09 17:56:08 +01:00
Lukasz Marek
457204ee15
lavu/opt: document av_opt_copy function
2014-11-09 17:56:08 +01:00
Lukasz Marek
db2caf0a80
lavc/options: fix shallow copy context
...
avcodec_copy_context leaves shallow copy of string/binary/dict options.
Double free/accessing freed memory may occur.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-11-09 17:56:08 +01:00
Marton Balint
86476c510e
avfilter/avf_showwaves: fix off by one error in loop condition
...
It caused segfaults.
Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-09 16:44:10 +01:00
Marton Balint
7ba7277775
ffplay: only output null packet once on EOF
...
The generic decoder properly flushes the codecs with one null packet as well.
Signed-off-by: Marton Balint <cus@passwd.hu>
2014-11-09 13:48:18 +01:00
Marton Balint
cc4741888d
ffplay: fix indentation after last commit
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2014-11-09 13:48:18 +01:00
Marton Balint
631ac655c0
ffplay: implement separete audio decoder thread
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2014-11-09 13:48:18 +01:00
Luca Barbato
09f25533a5
v4l2: Preserve errno values
...
av_log usually resets it.
2014-11-09 12:59:32 +01:00
Michael Niedermayer
d1970929b5
avformat/librtmp: fix swfurl
...
Found-by: JULIAN GARDNER <joolzg@btinternet.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-09 12:36:23 +01:00
Tristan Matthews
a1a259881f
v4l2: Use av_strerror
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-11-09 12:29:59 +01:00
Luca Barbato
e3e317e0c0
lavc: Compact the side-data passthrough
2014-11-09 12:29:59 +01:00
Michael Niedermayer
55d592f7d9
avcodec/aacdec: Skip processing channel elements which have not been present
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-09 11:41:13 +01:00
Michael Niedermayer
f9fa560597
avcodec/aacenc: check input for NaN
...
Fixes Ticket3762
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-08 23:32:39 +01:00
Michael Niedermayer
41ad87ad8e
avformat/mpegts: improve first valid PMT heuristic
...
This checks for audio+video instead of streams > 2
Fixes Ticket4090
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-08 21:35:20 +01:00
Michael Niedermayer
29b1af40f3
avformat/mpegts: add scan_all_pmts option
...
This allows selecting if the demuxer should consider all streams to be
found after the first PMT and add further streams during decoding or if it rather
should scan all that are within the analyze-duration and other limits
Fixes Ticket3762
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-08 21:35:20 +01:00
Michael Niedermayer
6f21fb7932
Revert "v4l2: setting device parameters early"
...
This reverts commit b1ad931233
.
Fixes Ticket #3517
Conflicts:
libavdevice/v4l2.c
Requested-by: Giorgio Vazzana <mywing81@gmail.com>
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-08 12:43:50 +01:00
Michael Niedermayer
b0ed88b4c0
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Remove fminf() emulation.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-08 12:26:55 +01:00
Michael Niedermayer
9ebfe38f38
Merge commit '9a5ac36b69ede4563e9ecd734141b12ea3280fbc'
...
* commit '9a5ac36b69ede4563e9ecd734141b12ea3280fbc':
movenc: Require samples before trying to write edts
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-08 11:41:29 +01:00
Carl Eugen Hoyos
4436a8f44d
Remove fminf() emulation.
...
The emulation is unused and causes compilation trouble on systems
where fminf() is defined in <math.h> but missing from libm.
This should fix compilation on Debian powerpcspe.
2014-11-08 11:31:11 +01:00
Michael Niedermayer
4342b346d2
Merge commit '8cb7b7b461b52898765b38e3eff68c0ce88347f3'
...
* commit '8cb7b7b461b52898765b38e3eff68c0ce88347f3':
movenc: Avoid leaking locally allocated data when returning on errors
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-08 11:08:57 +01:00
Michael Niedermayer
0bdc5db520
Merge commit '95a449d3ce8e15522df47a80a8a4593ea5c2b1bb'
...
* commit '95a449d3ce8e15522df47a80a8a4593ea5c2b1bb':
movenc: Remove an outdated comment
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-08 10:57:10 +01:00
Martin Storsjö
9a5ac36b69
movenc: Require samples before trying to write edts
...
This avoids a potential crash if writing a fragmented psp mp4
(which probably is only a hypothetical scenario).
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-11-08 11:14:21 +02:00
Martin Storsjö
8cb7b7b461
movenc: Avoid leaking locally allocated data when returning on errors
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-11-08 11:14:08 +02:00
Martin Storsjö
95a449d3ce
movenc: Remove an outdated comment
...
QuickTime does support files with an empty initial movie
these days.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-11-08 11:13:37 +02:00
Lukasz Marek
2b14593148
ffmpeg_opt: free incorrect priv_data for feed stream
...
new_output_stream creates a codec context with arbitraty picked codec.
Later data is updated, but priv_data are left alone.
There is a bit chance there is a mismatch between codecs.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-08 02:14:02 +01:00
Xiaohan Wang
33301f0017
Fix read-after-free in matroska_read_seek().
...
In matroska_read_seek(), |tracks| is assigned at the begining of the function.
However, functions like matroska_parse_cues() could reallocate the tracks so
that |tracks| can get invalidated.
This CL assigns |tracks| only before we use it so that it won't be invalidated.
BUG=427266
TEST=Test case in associated bug passes now.
Change-Id: I9c7065fe8f4311ca846076281df2282d190ed344
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-08 01:33:13 +01:00
Michael Niedermayer
c9a9a7a1fd
Merge commit '9cbf70fa0e44613590b019cef1fe99aa3f3c5d9d'
...
* commit '9cbf70fa0e44613590b019cef1fe99aa3f3c5d9d':
movenc: Write correct presentation timestamps in tfra
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-08 01:04:04 +01:00
Carl Eugen Hoyos
e2e36a739d
Fix make checkheaders for libavcodec/vorbis_parser.h.
2014-11-08 00:59:37 +01:00
Michael Niedermayer
872c0bcd3c
Merge commit 'e7d20f12c5eff5570cd897f3ce3a88456024036b'
...
* commit 'e7d20f12c5eff5570cd897f3ce3a88456024036b':
movenc: Remove a now redundant check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-08 00:32:52 +01:00
Michael Niedermayer
2893d1b36d
Merge commit '1d8a0c1b43e58332a3a15c67d4adc161713cade8'
...
* commit '1d8a0c1b43e58332a3a15c67d4adc161713cade8':
movenc: Allow to request not to use edit lists
Conflicts:
libavformat/movenc.c
See: 537ef8bebf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-08 00:22:42 +01:00
Michael Niedermayer
0d71e825db
Merge commit '897d5c3a4296f3da80b8699d1487328ca2de8e55'
...
* commit '897d5c3a4296f3da80b8699d1487328ca2de8e55':
lavf: Print a warning if failed to avoid negative timestamps when requested
Conflicts:
libavformat/mux.c
See: ec6a5fc6cc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-07 23:22:10 +01:00
Michael Niedermayer
66e49ff3b9
Merge commit '1384df641994bf3d6cb51084290aa94752737bae'
...
* commit '1384df641994bf3d6cb51084290aa94752737bae':
lavf: Add an option for avoiding negative timestamps
Conflicts:
libavformat/avformat.h
libavformat/mux.c
libavformat/options_table.h
libavformat/version.h
See: 3ba0dab76a
See: a89c012531
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-07 23:09:30 +01:00
Michael Niedermayer
ed736890d6
Merge commit '4981baf9b803f3c4866b2e97fdadb008c62dc7ad'
...
* commit '4981baf9b803f3c4866b2e97fdadb008c62dc7ad':
avstring: Mark some character handling functions av_const
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-07 22:33:09 +01:00