Michael Niedermayer
29d64b1d8e
Merge commit '66d3f5fd5ca4cb3d09b52ad1041cd4359325a21a'
...
* commit '66d3f5fd5ca4cb3d09b52ad1041cd4359325a21a':
lavc doxy: remove false statements about alignment requirements.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13 08:09:28 +02:00
Michael Niedermayer
b35ef855a4
Merge commit '364af376f343d4706c4cdb7ab9fe0863994e6c01'
...
* commit '364af376f343d4706c4cdb7ab9fe0863994e6c01':
FATE: add lavr resampling tests
The tests do not pass, and thus where disabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13 08:01:56 +02:00
Michael Niedermayer
de80cebdd7
Merge commit '9ab5f7107d2f1411e9fda6c36af64524e5ed31d1'
...
* commit '9ab5f7107d2f1411e9fda6c36af64524e5ed31d1':
FATE: add lavr mixing tests
The tests do not pass, and thus where disabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13 07:32:11 +02:00
Michael Niedermayer
830a567e96
Merge commit 'df6737a55f5dc7c0ae5272bc5fa6182836d5481c'
...
* commit 'df6737a55f5dc7c0ae5272bc5fa6182836d5481c':
audio_mix: fix channel order in mix_1_to_2_fltp_flt_c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13 06:48:35 +02:00
Michael Niedermayer
87fe0bbd69
lavc: rename h265 to hevc, add AV_CODEC_ID_H265 with identical value for backward compatibility
...
Somehow 2 different identifiers have come into existence which makes supporting
both until the next major version bump required
I did not investigate how exactly that did happen.
wm4, j-b and smarter prefer hevc.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13 00:26:27 +02:00
Paul B Mahol
fd54f70072
avformat/avr: use ff_get_pcm_codec_id()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-12 20:21:38 +00:00
Paul B Mahol
cfc9a4c732
avfilter/vsrc_testsrc: smpte(hd)bars: use yuv directly
...
Also set color space.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-12 18:40:15 +00:00
Paul B Mahol
1d8ce109e9
avfilter/vf_separatefields: do not reset pts to 0
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-12 15:10:19 +00:00
Anton Khirnov
66d3f5fd5c
lavc doxy: remove false statements about alignment requirements.
...
The packet data does not need to be aligned.
2013-10-12 15:09:38 +02:00
Anton Khirnov
364af376f3
FATE: add lavr resampling tests
2013-10-12 15:07:46 +02:00
Anton Khirnov
9ab5f7107d
FATE: add lavr mixing tests
2013-10-12 15:07:26 +02:00
Anton Khirnov
df6737a55f
audio_mix: fix channel order in mix_1_to_2_fltp_flt_c
...
CC:libav-stable@libav.org
2013-10-12 15:06:55 +02:00
Michael Niedermayer
8de021fabe
Merge remote-tracking branch 'lukaszmluki/master'
...
* lukaszmluki/master:
avformat/ftp: add log regarding passive mode failure
avformat/ftp: fix possible deadlock
avdevice/pulse_audio_enc: fix stream index
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-12 14:14:54 +02:00
Michael Niedermayer
23c8a3353b
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
riff: Add a mapping for VP6A
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-12 14:03:54 +02:00
Lukasz Marek
3a92ee5953
avformat/ftp: add log regarding passive mode failure
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2013-10-12 13:52:33 +02:00
Lukasz Marek
e1fb3143bb
avformat/ftp: fix possible deadlock
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2013-10-12 13:52:33 +02:00
Lukasz Marek
7b1640c4a6
avdevice/pulse_audio_enc: fix stream index
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2013-10-12 13:52:26 +02:00
Martin Storsjö
a52b5a5a07
riff: Add a mapping for VP6A
...
This allows demuxing VP6A from F4V files.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-10-12 13:02:45 +03:00
Michael Niedermayer
aeddc6e3a5
avfilter/lavfutils: fix memleak of avpacket
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-12 11:52:10 +02:00
Michael Niedermayer
eedfee12c6
avfilter/vf_removelogo: fix pixel pointer so it points where its intended
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-12 11:36:55 +02:00
Michael Niedermayer
8c582d1b22
avfilter/vf_removelogo: fix offset for accessing pixels above and below
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-12 11:35:54 +02:00
Michael Niedermayer
8c0687abdf
avfilter/vf_removelogo: use av_freep() for saftey
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-12 11:31:38 +02:00
Michael Niedermayer
e4d45673ca
avformat/movenc: set XDCAM codec tag correctly
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-12 01:42:53 +02:00
Michael Niedermayer
713dcdbfcb
avformat/movenc: set pretty compressor name for XDCAM
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-12 01:42:53 +02:00
Michael Niedermayer
ce994a03f5
avformat/movenc: make AVStream easier to access
...
This adds a AVStream pointer to Track
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-12 01:42:53 +02:00
Timothy Gu
024bf3a1c2
doc/codecs: Add missing mpeg2 aac profiles
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-11 20:00:06 +02:00
Timothy Gu
1fdae1017c
doc/codecs: Add ignorecrop
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-11 19:59:49 +02:00
Timothy Gu
db4a677433
doc/codecs: Remove no longer existing options
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-11 19:59:07 +02:00
Timothy Gu
a55e813e53
doc/codecs: Cosmetics in the flags2 description
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-11 19:57:47 +02:00
Michael Niedermayer
dfb89fee2d
doc/codecs: document skip_alpha
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-11 16:59:32 +02:00
Michael Niedermayer
e7fa0417b3
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
prores: Reject negative run and level values
See: 93c220e895
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-11 16:48:26 +02:00
Stefano Sabatini
f02bab6d09
doc/filters/scale: do not explicitly state the default swscale flags value
...
This is done is order to avoid the need of synching scale with libswscale
docs in case the libswscale default changes.
2013-10-11 16:40:20 +02:00
Carl Eugen Hoyos
a12ab37d1f
lavf/riff.c: Fix GeoVision H.264 fourcc.
...
Fixes d24da748
2013-10-11 16:23:09 +02:00
Carl Eugen Hoyos
d24da748c3
Add H.264 fourcc GAVC for GeoVision cameras.
2013-10-11 10:02:00 +02:00
Michael Niedermayer
08b22c0ea5
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mxf: Add jpeg2000 codec to intra only codecs
See: c461265a76
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-11 09:22:10 +02:00
Michael Niedermayer
bb8ce36dc2
Merge commit '5f5ada3dbf97e306a74250ba8dcf8619ad59b020'
...
* commit '5f5ada3dbf97e306a74250ba8dcf8619ad59b020':
shorten: Fix out-of-array read
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-11 09:20:26 +02:00
Michael Niedermayer
964f9ca229
Merge commit 'ed796fba761f4794bec7735d467c1b2c8e1858fe'
...
* commit 'ed796fba761f4794bec7735d467c1b2c8e1858fe':
atrac3: Better name for IMDCT window initialization
atrac3: Remove unused gain compensation tables
See: 2d52834910
See: 4fb8de08e1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-11 08:23:07 +02:00
Michael Niedermayer
a72bf5fd11
ffmpeg: set the source_index for trivial filter graphs
...
Fixes one testcase in Ticket2969
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-11 00:51:09 +02:00
Luca Barbato
c0de9a23c7
prores: Reject negative run and level values
...
Sample-Id: 00000611-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-10-10 21:02:10 +02:00
Paul B Mahol
996c73490c
avcodec/exr: remove pointless initialization
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-10 18:24:49 +00:00
Maxim Poliakovski
2d52834910
atrac3: Better name for imdct window initialization
...
Patch by Diego Biurrun.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 18:33:16 +02:00
Maxim Poliakovski
4fb8de08e1
atrac3: Remove unused gain compensation tables
...
Patch by Diego Biurrun.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 18:33:07 +02:00
Matthieu Bouron
054454c63a
mxf: Add jpeg2000 codec to intra only codecs
...
Conform with SMPTE RP 224 and SMPTE s422.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-10-10 18:22:46 +02:00
Tim Walker
5f5ada3dbf
shorten: Fix out-of-array read
...
pred_order == FF_ARRAY_ELEMS(fixed_coeffs) is invalid too.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-10-10 17:52:14 +02:00
Michael Niedermayer
a830915b78
swscale: Use full resolution chroma for yuv2rgb when the input has full chroma
...
See Ticket3028
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 17:28:59 +02:00
Paul B Mahol
d1d875d301
avfilter/vf_w3fdif: do not reset pts to 0
...
Shamelessly stolen from yadif.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-10 15:08:55 +00:00
Michael Niedermayer
cdc9657a0c
doc/codecs: Document field_order
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 16:03:37 +02:00
Maxim Poliakovski
ed796fba76
atrac3: Better name for IMDCT window initialization
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-10-10 14:29:54 +02:00
Maxim Poliakovski
be76415047
atrac3: Remove unused gain compensation tables
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-10-10 14:26:13 +02:00
Timothy Gu
7ab8bceabc
doc/encoder/aac: Remove -cutoff trick
...
Fix Ticket #2686 comment 155.
Trick obsoleted since 72dabdfc58
.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 13:43:56 +02:00