Paul B Mahol
a807c68253
avformat: use ff_alloc_extradata()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-13 20:13:38 +00:00
Paul B Mahol
3fd79833e2
avformat: add ff_alloc_extradata() helper
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-13 20:13:38 +00:00
Michael Niedermayer
522f78f8ea
avformat/oggparseopus: fix nb_headers
...
Line comes from ecab1c7741
and was not merged previously
Thanks-to: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13 18:25:42 +02:00
Paul B Mahol
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
Michael Niedermayer
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
Michael Niedermayer
77caa31f71
Merge commit 'c18375ec8040a9fe0f186b2033dc975883143758'
...
* commit 'c18375ec8040a9fe0f186b2033dc975883143758':
oggvorbisdec: add support for embedded cover art
Conflicts:
libavformat/oggparsevorbis.c
See: 193782216f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13 09:51:00 +02:00
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>
2013-10-13 09:37:21 +02:00
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>
2013-10-13 09:09:43 +02:00
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>
2013-10-13 08:53:47 +02:00
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>
2013-10-13 08:28:05 +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
Vittorio Giovara
fd2384f02b
oggparsevorbis: fail on memory allocation error
2013-10-12 15:37:56 +02:00
James Almer
c18375ec80
oggvorbisdec: add support for embedded cover art
...
Signed-off-by: James Almer <jamrial@gmail.com>
2013-10-12 15:34:10 +02:00
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>
2013-10-12 15:30:39 +02:00
Nicolas George
ecab1c7741
oggdec: add support for Opus in Ogg demuxing
2013-10-12 15:25:18 +02:00
Vittorio Giovara
ed9245dba8
oggparsevorbis: check allocations
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-10-12 15:24:26 +02:00
James Almer
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
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
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
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
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
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
Michael Niedermayer
7acb464f0e
Merge commit 'e6ed8668597cfea25dfb350a9b4df7fb2efc1d90'
...
* commit 'e6ed8668597cfea25dfb350a9b4df7fb2efc1d90':
flvenc: Write proper cropping for VP6 even if there's no extradata
Conflicts:
libavformat/flvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 12:06:17 +02:00
Michael Niedermayer
c2555bcbd1
Merge commit 'be1e1373d267bae2af8a62d79eef736736f24565'
...
* commit 'be1e1373d267bae2af8a62d79eef736736f24565':
flvenc: Support muxing VP6A as well
Conflicts:
libavformat/flvenc.c
See: 42ae83c196
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 11:58:58 +02:00
Michael Niedermayer
0efbd98e23
Merge commit '4d7aeff9a1080e64125f3374d993b2c9c4c2751b'
...
* commit '4d7aeff9a1080e64125f3374d993b2c9c4c2751b':
flvenc: Don't pretend to support muxing "plain" VP6
Conflicts:
libavformat/flvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 11:45:45 +02:00
Michael Niedermayer
5fcd0a80a2
Merge commit 'ceec6e792e4b5baaa23b220f4fd33417631f5288'
...
* commit 'ceec6e792e4b5baaa23b220f4fd33417631f5288':
avi: directly resync on DV in AVI read failure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 11:31:40 +02:00
Michael Niedermayer
dd0429e1de
Merge commit '756547ce7f4d67a18663503e2157aebed3531703'
...
* commit '756547ce7f4d67a18663503e2157aebed3531703':
avi: DV in AVI must be considered single stream
Conflicts:
libavformat/avidec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 11:22:28 +02:00
Michael Niedermayer
c589c4c52d
Merge commit '1cac9accbd1f9b8596122d0735e37b97a844c514'
...
* commit '1cac9accbd1f9b8596122d0735e37b97a844c514':
avi: properly fail if the dv demuxer is missing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 10:40:33 +02:00
Martin Storsjö
e6ed866859
flvenc: Write proper cropping for VP6 even if there's no extradata
...
This keeps cropping when remuxing from F4V to FLV.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-10-10 10:42:28 +03:00
Martin Storsjö
be1e1373d2
flvenc: Support muxing VP6A as well
...
Handle it in the same way as VP6F, except for the codec tag.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-10-10 10:42:10 +03:00
Martin Storsjö
4d7aeff9a1
flvenc: Don't pretend to support muxing "plain" VP6
...
The plain VP6 format is vertically flipped compared to VP6F/VP6A.
Support for the plain VP6 format was added in 09d8c0ae83
(which
also introduced support for muxing VP6F properly in general).
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-10-10 10:41:44 +03:00
Luca Barbato
ceec6e792e
avi: directly resync on DV in AVI read failure
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-10-10 07:28:17 +02:00
Luca Barbato
756547ce7f
avi: DV in AVI must be considered single stream
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-10-10 07:28:03 +02:00
Luca Barbato
1cac9accbd
avi: properly fail if the dv demuxer is missing
...
CC: libav-stable@libav.org
2013-10-10 07:27:50 +02:00
Michael Niedermayer
83fc6c822b
avformat/wavdec: Dont trust the fact chunk for PCM
...
Fixes Ticket3033
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-09 22:18:19 +02:00
Michael Niedermayer
8c0f565ee3
avformat/movenc: factor out find_fps()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-08 14:18:43 +02:00
Michael Niedermayer
8f2386b589
avformat/oggparseflac: fix handling of old flac in ogg
...
Improves handling of the file in Ticket1617
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-07 01:36:05 +02:00
Diego Biurrun
9adbc3f3a1
bmv: Remove unused variable
2013-10-06 19:36:53 +02:00
Michael Niedermayer
4634871b51
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
oggparsevorbis: return meaningful errors
Conflicts:
libavformat/oggparsevorbis.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-06 12:24:13 +02:00
Michael Niedermayer
6853e40106
avformat/matroskadec: only set r_frame_rate if the value is within reasonable limits
...
Fixes Ticket2451
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-06 00:22:08 +02:00
Vittorio Giovara
90e15e340d
oggparsevorbis: return meaningful errors
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-10-05 23:16:48 +02:00
Michael Niedermayer
a7630e3755
Merge commit 'b698542ad83284fbb8c22404e3cafeb2dd739d38'
...
* commit 'b698542ad83284fbb8c22404e3cafeb2dd739d38':
mov: Don't allocate arrays with av_malloc that will be realloced
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-05 10:50:47 +02:00
Michael Niedermayer
e1f8184a1a
avformat/gifdec: make GIF_APP_EXT_LABEL parsing more robust
...
Fixes Ticket3021
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-04 23:26:40 +02:00