generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
46,594 Commits 24 Branches 241 Tags 173 MiB
6f78ba8b0b
Commit Graph

11548 Commits

Author SHA1 Message Date
Peter Ross
6f78ba8b0b electronic arts: support rare samples containing adpcm_ea_r1 audio 
Fixes ticket #1549.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-11 12:52:02 +01:00
Peter Ross
d168fcb68f electronicarts: use av_log_ask_for_sample 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-11 12:51:16 +01:00
Michael Niedermayer
d7da4d47a6 mxfdec: avoid double free and leaks. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-11 02:20:04 +01:00
Michael Niedermayer
c2ca0163af matroskadec: check h in generic rm packet shuffler 
Fixes crash

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-11 01:19:44 +01:00
Clément Bœsch
e56b098410 lavf/srtenc: ignore invalid timed packets instead of failing. 
This way we don't abort in the middle of remuxing, just warn about an
event ignored. The index increment is moved to make sure the output
numbers still make sense.
 2012-11-10 22:43:27 +01:00
Michael Niedermayer
eb3dc23705 mov: Make sure no streams after the header lack a timescale. 
Fixes division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-10 13:29:23 +01:00
Piotr Bandurski
cc5c2ef09d riff: add SMV2 FourCC for H264 
sample:

http://samples.mplayerhq.hu/V-codecs/smv2.avi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-10 13:16:14 +01:00
Carl Eugen Hoyos
b56ff0b261 Allow forcing a frame size in bytes for image2pipe. 
This allows decoding of concatenated frames encoded in
uncompressed formats like v210.
The frame size cannot be generally calculated, FFmpeg
also supports broken encoders.

Fixes ticket #1869.
 2012-11-10 02:25:17 +01:00
Carl Eugen Hoyos
f91f049a22 Add yuv4xxp12 and yuv4xxp14 pixel formats to y4m encoder and decoder. 
Reviewed-by: Paul B Mahol
 2012-11-10 02:19:55 +01:00
Piotr Bandurski
49c2f2d57e riff: add GXVE FourCC for WMV2 
sample:

http://samples.mplayerhq.hu/V-codecs/ViVD/vivd.avi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-10 01:58:51 +01:00
Michael Niedermayer
c63e76ba35 ebml_read_binary: use fast_padded_malloc() 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-09 23:35:58 +01:00
Michael Niedermayer
e481ba2ed7 vqf: check samplerate, avoid division by 0. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-09 18:05:19 +01:00
Michael Niedermayer
7989f7e0b5 xmv: Fix integer overflow 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-09 17:18:01 +01:00
Michael Niedermayer
7ec1fe1f47 lavf: Dont compare absolute to relative timestamps in duration gcd 
This prevents a division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-09 14:59:43 +01:00
Michael Niedermayer
1b5a6d3c49 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  flacenc: ensure the order is within the min/max range in LPC order search
  avconv: rescale packet duration to muxer time base when flushing encoders
  add 24-bit FLAC encoding to Changelog
  rtpenc_aac: Fix calculation of the header size
  x86: h264_intrapred: port to cpuflags

Conflicts:
	Changelog
	libavformat/rtpenc_aac.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-09 10:29:51 +01:00
Luca Abeni
e004d175fe rtpenc_aac: Fix calculation of the header size 
Previously the high end byte was always set to zero. Also get
rid of an unnecessary multiplication (which in practice couldn't
overflow) before shifting.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-11-08 19:48:32 +02:00
Michael Niedermayer
5ff43ec72d sctp: silence const warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-08 16:06:04 +01:00
Michael Niedermayer
60e028958c ffmdec: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-08 15:54:14 +01:00
Luca Abeni
78e08fd340 rtpenc_aac: Fix 10l bug 
Fixes CID602564
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-08 01:54:16 +01:00
Peter Ross
a373f35272 wtvenc: produce seekable files 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-07 13:59:03 +01:00
Peter Ross
b89cd2a028 wtvenc: simplify write_timestamp 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-07 13:51:38 +01:00
Peter Ross
3e65134326 wtvenc: output third video pts in timestamp chunk (this is what Microsoft Windows Media Center expects) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-07 13:45:01 +01:00
Peter Ross
0d9435048c wtvenc: indent fixup 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-07 13:44:50 +01:00
Peter Ross
b50759cd6b wtvenc: do not emit stream2 and DSATTRIB_TRANSPORT_PROPERTY chunks; these are not required for playback 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-07 13:42:01 +01:00
Paul B Mahol
7c2cfaac6a smjpegenc: use bits_per_coded_sample instead of calling function 
Final result is same and this allows support of multiple values per codec.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-07 01:31:39 +00:00
Nicolas George
e9b8523d52 sbgdec: dont set slide to a uninitialized value 
Fixed CID703833
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-06 21:46:22 +01:00
Michael Niedermayer
2ca649f177 utils: fix integer overflow with DURATION_MAX_READ_SIZE 
Fixes CID703746
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-06 18:44:14 +01:00
Peter Ross
e6ef628b1e wtv: move duplicated guids into wtv.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-06 15:52:33 +01:00
Peter Ross
1701a22fce wtv: rename ff_stream_guid to ff_SBE2_STREAM_DESC_EVENT 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-06 15:51:41 +01:00
Peter Ross
9632f5efcf wtvenc: fix typo 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-06 15:50:36 +01:00
Michael Niedermayer
2a0dfc51ea img2enc: support 16bit per sample yuv in split planes. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-06 02:27:04 +01:00
Michael Niedermayer
2c87565147 img2enc: support storing alpha planes too in split plane mode 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-06 01:42:26 +01:00
Michael Niedermayer
db012e161e img2enc: Fix yuva with yuv split planes. 
Previously the chroma planes where corrupted in this case.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-06 01:31:41 +01:00
Michael Niedermayer
67ee2d2f6d img2enc: check pix_fmt for split planes mode. 
Found-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-06 01:31:41 +01:00
Michael Niedermayer
6dfcc7abdd img2enc: ensure that the codec is rawvideo for split planes mode. 
Found-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-06 01:31:41 +01:00
Michael Niedermayer
7d26be63c2 Merge commit '5ff998a233d759d0de83ea6f95c383d03d25d88e' 
* commit '5ff998a233d759d0de83ea6f95c383d03d25d88e':
  flacenc: use uint64_t for bit counts
  flacenc: remove wasted trailing 0 bits
  lavu: add av_ctz() for trailing zero bit count
  flacenc: use a separate buffer for byte-swapping for MD5 checksum on big-endian
  fate: aac: Place LATM tests and general AAC tests in different groups
  build: The A64 muxer depends on rawenc.o for ff_raw_write_packet()

Conflicts:
	doc/APIchanges
	libavutil/version.h
	tests/fate/aac.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-05 22:51:20 +01:00
Martin Storsjö
f0615557e0 rtmpproto: Use av_strlcat instead of strncat 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes: [FFmpeg-devel] rtmpproto compile error
Similar patch: [FFmpeg-devel] [PATCH] call to strncat replaced with av_strlcat to avoid compile issue with systems implementing strncat via strcat.
 2012-11-05 21:47:43 +01:00
Paul B Mahol
70727e8774 lavf/avr: make .long_name consistent with others 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-05 20:47:22 +00:00
Michael Niedermayer
282a6308bf udp: check ff_socket_nonblock() return code 
Fixes CID733719
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-05 21:21:04 +01:00
Diego Biurrun
92fec47d69 build: The A64 muxer depends on rawenc.o for ff_raw_write_packet() 2012-11-05 20:48:50 +01:00
Michael Niedermayer
30d27685b1 segment: fix null ptr deref 
Fixes CID732220
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-05 20:26:10 +01:00
Paul B Mahol
962314fe27 AVR demuxer 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-05 17:31:22 +00:00
Piotr Bandurski
461797f6aa riff: add "lsvm" FourCC for H263. 2012-11-05 17:43:01 +01:00
Michael Niedermayer
9829ec1a9c ffm: redesign header format to make it extensible 
Currently FFM files generated with one versions of ffmpeg generally
cannot be read by another.
By spliting data into chunks, more fields can saftely be appended to
chunks as well as new chunks added.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-05 16:36:44 +01:00
Martin Storsjö
d578f94746 rtmp: Use av_strlcat instead of strncat 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-11-05 15:37:09 +02:00
Clément Bœsch
a8b3130181 lavf/srtdec: recognize subtitles starting at event index 0. 2012-11-05 07:37:45 +01:00
Michael Niedermayer
e82afa3e2d filmstripenc: fix rounding that caused fate failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-05 00:28:21 +01:00
Michael Niedermayer
a147c1b2b1 oggenc: remove unneeded null check. 
The code would have segfaulted before if it where null

Fixes CID732218
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-05 00:28:21 +01:00
Paul B Mahol
992a6a53ef cdxl: add read_probe function 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-04 20:19:43 +00:00
Paul B Mahol
c4dd4f19f3 smush: improve probing 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-04 16:50:58 +00:00