Michael Niedermayer
92b03cf926
Merge commit '601d6228c4811d8971a2412a759e1a4ab775ebe8'
...
* commit '601d6228c4811d8971a2412a759e1a4ab775ebe8':
flac: move picture parsing code in a separate file
Conflicts:
libavformat/Makefile
libavformat/flacdec.c
See: 1e5bbbfcf3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
8dbf98e68a
Merge commit 'ecab1c77410f023b437c6ed3a3281be8f039e574'
...
* commit 'ecab1c77410f023b437c6ed3a3281be8f039e574':
oggdec: add support for Opus in Ogg demuxing
Conflicts:
Changelog
libavformat/oggparseopus.c
libavformat/version.h
See: e62fd6619f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
3ce0eddeab
Merge commit 'ed9245dba83f9add60f55718b537b0af2105c60e'
...
* commit 'ed9245dba83f9add60f55718b537b0af2105c60e':
oggparsevorbis: check allocations
Conflicts:
libavformat/oggparsevorbis.c
See: 033f1644b5
See: 84aea80f78
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
b6ffe8afd9
Merge commit '9c15ef35d404fca2adc31276c1eedb11cf485461'
...
* commit '9c15ef35d404fca2adc31276c1eedb11cf485461':
oggparsevorbis: support official chapter extension
Conflicts:
libavformat/oggparsevorbis.c
See: 04b9836274
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
40ade07141
Merge commit '16ea20c827ef2ffaf77d5e05d5cf9983689f7b2b'
...
* commit '16ea20c827ef2ffaf77d5e05d5cf9983689f7b2b':
lavc doxy: extend/clarify avcodec_decode_audio4() doxy
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
29d64b1d8e
Merge commit '66d3f5fd5ca4cb3d09b52ad1041cd4359325a21a'
...
* commit '66d3f5fd5ca4cb3d09b52ad1041cd4359325a21a':
lavc doxy: remove false statements about alignment requirements.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
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>
11 years ago
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>
11 years ago
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>
11 years ago
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>
11 years ago
Paul B Mahol
fd54f70072
avformat/avr: use ff_get_pcm_codec_id()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
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>
11 years ago
Paul B Mahol
1d8ce109e9
avfilter/vf_separatefields: do not reset pts to 0
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
James Almer
601d6228c4
flac: move picture parsing code in a separate file
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
11 years ago
Nicolas George
ecab1c7741
oggdec: add support for Opus in Ogg demuxing
11 years ago
Vittorio Giovara
ed9245dba8
oggparsevorbis: check allocations
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
11 years ago
James Almer
9c15ef35d4
oggparsevorbis: support official chapter extension
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
11 years ago
Anton Khirnov
16ea20c827
lavc doxy: extend/clarify avcodec_decode_audio4() doxy
...
Elaborate on flushing the decoder.
11 years ago
Anton Khirnov
66d3f5fd5c
lavc doxy: remove false statements about alignment requirements.
...
The packet data does not need to be aligned.
11 years ago
Anton Khirnov
364af376f3
FATE: add lavr resampling tests
11 years ago
Anton Khirnov
9ab5f7107d
FATE: add lavr mixing tests
11 years ago
Anton Khirnov
df6737a55f
audio_mix: fix channel order in mix_1_to_2_fltp_flt_c
...
CC:libav-stable@libav.org
11 years ago
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>
11 years ago
Michael Niedermayer
23c8a3353b
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
riff: Add a mapping for VP6A
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Lukasz Marek
3a92ee5953
avformat/ftp: add log regarding passive mode failure
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
11 years ago
Lukasz Marek
e1fb3143bb
avformat/ftp: fix possible deadlock
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
11 years ago
Lukasz Marek
7b1640c4a6
avdevice/pulse_audio_enc: fix stream index
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
11 years ago
Martin Storsjö
a52b5a5a07
riff: Add a mapping for VP6A
...
This allows demuxing VP6A from F4V files.
Signed-off-by: Martin Storsjö <martin@martin.st>
11 years ago
Michael Niedermayer
aeddc6e3a5
avfilter/lavfutils: fix memleak of avpacket
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
eedfee12c6
avfilter/vf_removelogo: fix pixel pointer so it points where its intended
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
8c582d1b22
avfilter/vf_removelogo: fix offset for accessing pixels above and below
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
8c0687abdf
avfilter/vf_removelogo: use av_freep() for saftey
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
e4d45673ca
avformat/movenc: set XDCAM codec tag correctly
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
713dcdbfcb
avformat/movenc: set pretty compressor name for XDCAM
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
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>
11 years ago
Timothy Gu
024bf3a1c2
doc/codecs: Add missing mpeg2 aac profiles
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Timothy Gu
1fdae1017c
doc/codecs: Add ignorecrop
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Timothy Gu
db4a677433
doc/codecs: Remove no longer existing options
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
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>
11 years ago
Michael Niedermayer
dfb89fee2d
doc/codecs: document skip_alpha
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
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>
11 years ago
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.
11 years ago
Carl Eugen Hoyos
a12ab37d1f
lavf/riff.c: Fix GeoVision H.264 fourcc.
...
Fixes d24da748
11 years ago
Carl Eugen Hoyos
d24da748c3
Add H.264 fourcc GAVC for GeoVision cameras.
11 years ago
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>
11 years ago
Michael Niedermayer
bb8ce36dc2
Merge commit '5f5ada3dbf97e306a74250ba8dcf8619ad59b020'
...
* commit '5f5ada3dbf97e306a74250ba8dcf8619ad59b020':
shorten: Fix out-of-array read
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
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>
11 years ago
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>
11 years ago
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
11 years ago
Paul B Mahol
996c73490c
avcodec/exr: remove pointless initialization
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago