ede7602cba
Merge remote-tracking branch 'cus/stable'
...
* cus/stable:
ffplay: add support for changing the channel by the C key
ffplay: cycle through the streams of the current program, and not every stream
ffplay: add null packet after attached pics packet
ffplay: factor out putting null packet into the queue
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13 19:37:20 +02:00
ac3b01a9c0
avcodec/jpeg2000dec: check transform equality in MCT
...
Fixes null pointer dereference
Fixes Ticket2843
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13 19:23:24 +02:00
522f78f8ea
avformat/oggparseopus: fix nb_headers
...
Line comes from ecab1c7741
2013-10-13 18:25:42 +02:00
3130416aec
ffplay: add support for changing the channel by the C key
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-10-13 12:46:14 +02:00
543d81a707
ffplay: cycle through the streams of the current program, and not every stream
...
When changing the audio, video or subtitle stream, from now on, ffplay will
cycle through the streams of the current program.
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-10-13 12:31:52 +02:00
0258e4dc8b
ffplay: add null packet after attached pics packet
...
Fixes ticket #2904 .
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-10-13 12:31:52 +02:00
b118d3e24d
ffplay: factor out putting null packet into the queue
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-10-13 12:31:52 +02:00
fa7e9f9401
avformat/vocdec: return AVERROR_EOF when EOF is reached
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-13 09:50:38 +00:00
4b948dcadb
doc/developer: Merge license related policy items
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13 10:46:32 +02:00
43dec5ef9a
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
indeo4: Check the inherited quant_mat
Conflicts:
libavcodec/indeo4.c
See: 884efd4e09
2013-10-13 10:38:51 +02:00
d3850ac5b9
Merge commit '0cb83c563848bf8f8365e7bd30e7e6b57ef360f0'
...
* commit '0cb83c563848bf8f8365e7bd30e7e6b57ef360f0':
indeo4: Check the block size if reusing the band configuration
Conflicts:
libavcodec/indeo4.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13 10:19:15 +02:00
0c7bd34023
Merge commit 'fd2384f02b905a106fba9222ece4ddbe2ec61937'
...
* commit 'fd2384f02b905a106fba9222ece4ddbe2ec61937':
oggparsevorbis: fail on memory allocation error
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13 10:06:42 +02:00
77caa31f71
Merge commit 'c18375ec8040a9fe0f186b2033dc975883143758'
...
* commit 'c18375ec8040a9fe0f186b2033dc975883143758':
oggvorbisdec: add support for embedded cover art
Conflicts:
libavformat/oggparsevorbis.c
See: 193782216f
2013-10-13 09:51:00 +02:00
92b03cf926
Merge commit '601d6228c4811d8971a2412a759e1a4ab775ebe8'
...
* commit '601d6228c4811d8971a2412a759e1a4ab775ebe8':
flac: move picture parsing code in a separate file
Conflicts:
libavformat/Makefile
libavformat/flacdec.c
See: 1e5bbbfcf3
2013-10-13 09:37:21 +02:00
8dbf98e68a
Merge commit 'ecab1c77410f023b437c6ed3a3281be8f039e574'
...
* commit 'ecab1c77410f023b437c6ed3a3281be8f039e574':
oggdec: add support for Opus in Ogg demuxing
Conflicts:
Changelog
libavformat/oggparseopus.c
libavformat/version.h
See: e62fd6619f
2013-10-13 09:09:43 +02:00
3ce0eddeab
Merge commit 'ed9245dba83f9add60f55718b537b0af2105c60e'
...
* commit 'ed9245dba83f9add60f55718b537b0af2105c60e':
oggparsevorbis: check allocations
Conflicts:
libavformat/oggparsevorbis.c
See: 033f1644b584aea80f78
2013-10-13 08:53:47 +02:00
b6ffe8afd9
Merge commit '9c15ef35d404fca2adc31276c1eedb11cf485461'
...
* commit '9c15ef35d404fca2adc31276c1eedb11cf485461':
oggparsevorbis: support official chapter extension
Conflicts:
libavformat/oggparsevorbis.c
See: 04b9836274
2013-10-13 08:28:05 +02:00
40ade07141
Merge commit '16ea20c827ef2ffaf77d5e05d5cf9983689f7b2b'
...
* commit '16ea20c827ef2ffaf77d5e05d5cf9983689f7b2b':
lavc doxy: extend/clarify avcodec_decode_audio4() doxy
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13 08:17:01 +02:00
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
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
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
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
c9ef6b0932
indeo4: Check the inherited quant_mat
...
Invalidate it if not supported.
Sample-Id: 00000262-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-10-13 01:38:21 +02:00
0cb83c5638
indeo4: Check the block size if reusing the band configuration
...
Sample-Id: 00000287-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-10-13 01:38:20 +02:00
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
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
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
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
fd2384f02b
oggparsevorbis: fail on memory allocation error
2013-10-12 15:37:56 +02:00
c18375ec80
oggvorbisdec: add support for embedded cover art
...
Signed-off-by: James Almer <jamrial@gmail.com>
2013-10-12 15:34:10 +02:00
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>
2013-10-12 15:30:39 +02:00
ecab1c7741
oggdec: add support for Opus in Ogg demuxing
2013-10-12 15:25:18 +02:00
ed9245dba8
oggparsevorbis: check allocations
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-10-12 15:24:26 +02:00
9c15ef35d4
oggparsevorbis: support official chapter extension
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-10-12 15:24:08 +02:00
16ea20c827
lavc doxy: extend/clarify avcodec_decode_audio4() doxy
...
Elaborate on flushing the decoder.
2013-10-12 15:10:21 +02:00
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
364af376f3
FATE: add lavr resampling tests
2013-10-12 15:07:46 +02:00
9ab5f7107d
FATE: add lavr mixing tests
2013-10-12 15:07:26 +02:00
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
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
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
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
e1fb3143bb
avformat/ftp: fix possible deadlock
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2013-10-12 13:52:33 +02:00
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
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
aeddc6e3a5
avfilter/lavfutils: fix memleak of avpacket
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-12 11:52:10 +02:00
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
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
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
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
Marton Balint
Paul B Mahol
Luca Barbato
Vittorio Giovara
James Almer
Nicolas George
Anton Khirnov
Lukasz Marek
Martin Storsjö