virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Code Issues Releases Activity
52,149 Commits 37 Branches 400 Tags 460 MiB
6575539176
Commit Graph

12641 Commits

Author SHA1 Message Date
Michael Niedermayer
1557f34b10 dfa: support decoding version=1.0 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-15 12:13:41 +02:00
Clément Bœsch
e66a10689b lavf/libquvi: fix error reporting. 2013-04-15 01:18:11 +02:00
Clément Bœsch
8de9bb6e5e lavf: remove some flushing in write_packet muxers callbacks. 
Since 4f112a8e3, this is not necessary anymore. Also, it allows to
actually disable the flushing.
 2013-04-14 21:16:53 +02:00
Michael Niedermayer
536baf6cc5 oggenc: Fix pref_duration AVOption type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-13 20:30:03 +02:00
Hendrik Leppkes
423089e964 lavf/mxfdec: validate month/day before date formatting 
Some implementations of strftime do not like invalid values for
month/day, so ensure it doesn't happen.

Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-13 18:07:08 +02:00
Matthieu Bouron
c8b3644494 lavf/mxf: fix parsing of timestamps 
Correct bit mask for month/day/hour/min/sec values.

For reference the timestamp format specified in S377M is as follow:
  year (int16), month (uint8), day (uint8), hour (uint8), sec (uint8),
  msec (uint8).
A value of 0 for every fields means timestamp "unknown".

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-13 17:26:16 +02:00
Hendrik Leppkes
8da2a3aba3 lavf/mxfdec: use more widely supported time format string 
MSVC lacks support for %T and %F, but the standard specifies them
only as shorthands to the long variants.

Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-13 16:45:56 +02:00
Hendrik Leppkes
cac309611c lavf/mxf: fix parsing of the month from mxf timestamps 
Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-13 16:02:52 +02:00
Michael Niedermayer
647fe2e777 Merge commit '9e6b5e61a0c91e25e298d0a21b189c4c95443795' 
* commit '9e6b5e61a0c91e25e298d0a21b189c4c95443795':
  img2enc: add an option for overwriting one file with subsequent images

Conflicts:
	doc/muxers.texi
	libavformat/img2enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-11 21:50:53 +02:00
Tobias Rapp
7f09b888e8 avienc: fix overflow of audio sample count 
Fixes an overflow of the sample count field within the audio stream header
chunk if audio stream data exceeds 2GB.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-11 18:33:24 +02:00
Stephen Hutchinson
ff99b42e04 avformat/avisynth: Don't insert null frames or samples at the start of a stream. 
This is the last remaining issue from ticket #2412

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-11 16:32:14 +02:00
Michael Niedermayer
580a0600ef Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Move misplaced file author information where it belongs

Conflicts:
	libavcodec/adpcm.c
	libavcodec/adpcmenc.c
	libavcodec/gif.c
	libavcodec/x86/dsputilenc_mmx.c
	libavcodec/x86/fmtconvert_init.c
	libavformat/au.c
	libavformat/gif.c
	libavformat/mov.c
	libavformat/nsvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-11 15:56:18 +02:00
Marton Balint
f1e606c762 mxfdec: update current edit unit when seeking in mxf files without index tables 
Fixes audio packet pts values in some files generated by AVID TRMG 3.01.

Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-11 13:35:58 +02:00
Anton Khirnov
9e6b5e61a0 img2enc: add an option for overwriting one file with subsequent images 
Based on a patch by Michael Niedermayer <michaelni@gmx.at>.
 2013-04-11 12:30:44 +02:00
Diego Biurrun
ac9362c5d9 Move misplaced file author information where it belongs 2013-04-11 02:42:11 +02:00
Clément Bœsch
2a7f885fe1 lavf: add libquvi demuxer. 2013-04-10 12:09:20 +02:00
James Almer
89388a953a Replace all occurrences of PRI in sscanf() calls with SCN 
Signed-off-by: James Almer <jamrial@gmail.com>
 2013-04-10 09:56:48 +02:00
d s
685617ac29 avformat/avisynth: Cosmetics 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-10 02:25:34 +02:00
d s
ca3cef719e avformat/avisynth: Fix off-by-one error in avisynth demuxer. 
Fixes ticket #2412.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-10 02:25:34 +02:00
Michael Niedermayer
4e0130faed Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  srtp: Include rtpdec.h for RTP_MAX_PACKET_LENGTH
  rtpdec: Increase max rtp packet size to 8192
  lavf: Use RTP_MAX_PACKET_LENGTH instead of 1500
  h264pred: Add a few missing const declarations for ff_cropTbl derived pointers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-09 11:36:39 +02:00
Martin Storsjö
fc792308c5 srtp: Include rtpdec.h for RTP_MAX_PACKET_LENGTH 
This was missed from 350ad50b - this fixes building the fate-srtp
test.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-04-09 12:04:39 +03:00
Andrew Van Til
0e729b2290 rtpdec: Increase max rtp packet size to 8192 
This fixes connecting to "Ceton InfiniTV4 PCIe & USB".

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-04-09 10:36:56 +03:00
Andrew Van Til
350ad50bf4 lavf: Use RTP_MAX_PACKET_LENGTH instead of 1500 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-04-09 10:36:43 +03:00
Matthieu Bouron
1f2ce32825 lavf/wavdec: skip padding byte 
WAV chunks must be even aligned. This patch skip the extra padding byte
if chunk size is odd.

Fixes ticket #2417.

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-08 20:13:40 +02:00
Michael Niedermayer
0678c388ba rtsp: add option to set the socket timeout of the lower protocol. 
Fixes Ticket2294

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-08 17:45:13 +02:00
Michael Niedermayer
c6ae7f64a0 avio.h: fix indention 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-08 14:15:10 +02:00
Michael Niedermayer
8a97f6acc8 Merge remote-tracking branch 'mbouron/master' 
* mbouron/master:
  lavf/mxfdec: handle identification metadata

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-08 13:57:36 +02:00
Michael Niedermayer
7cfaf727a1 flvenc: dont call avio_flush() unconditional 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-08 13:31:53 +02:00
Michael Niedermayer
a286940da1 mux: also call avio_flush() when flushing the muxer 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-08 13:31:12 +02:00
Michael Niedermayer
ad6a50c0ed avformat: add writeout_count statistic 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-08 13:30:40 +02:00
Matthieu Bouron
25b143aa7b lavf/mxfdec: handle identification metadata 2013-04-08 11:16:56 +02:00
Michael Niedermayer
38665efcc7 asfenc: convert asserts to av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-07 03:59:44 +02:00
Clément Bœsch
1fabd95035 lavf/http: use a more compatible default user agent. 
Fixes Ticket 2265.
 2013-04-06 21:08:32 +02:00
Paul B Mahol
9a8f1e7295 img2dec: make use of AV_OPT_TYPE_IMAGE_SIZE 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-05 15:42:25 +00:00
Paul B Mahol
1d5b4f9fe9 img2dec: make use of AV_OPT_TYPE_VIDEO_RATE 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-05 15:42:25 +00:00
Paul B Mahol
d343848de2 rawvideodec: make use of AV_OPT_TYPE_IMAGE_SIZE 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-05 15:42:24 +00:00
Paul B Mahol
9f5bb44021 rawvideodec: make use of AV_OPT_TYPE_VIDEO_RATE 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-05 15:42:24 +00:00
Paul B Mahol
4c76600a8c rawdec: make use of AV_OPT_TYPE_VIDEO_RATE 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-05 15:42:24 +00:00
Paul B Mahol
3d9a789b0d bintext: make use of AV_OPT_TYPE_IMAGE_SIZE 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-05 15:42:24 +00:00
Paul B Mahol
33b6d215fa bintext: make use of AV_OPT_TYPE_VIDEO_RATE 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-05 15:42:24 +00:00
Paul B Mahol
8c43fd8654 tty: make use of AV_OPT_TYPE_IMAGE_SIZE 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-05 14:30:56 +00:00
Paul B Mahol
20343219d2 tty: make use of AV_OPT_TYPE_VIDEO_RATE 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-05 14:24:40 +00:00
Michael Niedermayer
8e85b69d71 Merge commit '8c65264595d5a82c56ae5043320e4b875a414229' 
* commit '8c65264595d5a82c56ae5043320e4b875a414229':
  pixdesc/pixfmt: Add XYZ colorspace for XYZ 12-bit values
  img2: Add j2k file extension for JPEG 2000

Conflicts:
	libavutil/pixfmt.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-05 12:39:06 +02:00
Andrew Van Til
8df46c65cf rtpdec: Increase max rtp packet size to 8192 
Fixes Ticket2314
Fixes connecting to "Ceton InfiniTV4 PCIe & USB"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-05 01:48:55 +02:00
Andrew Van Til
5ed9eebc24 rtsp/rtp_read_header: Use RTP_MAX_PACKET_LENGTH instead of 1500 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-05 01:48:55 +02:00
Nicolas Bertrand
5e46f6b5b7 img2: Add j2k file extension for JPEG 2000 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-04-04 19:47:05 +02:00
Michael Niedermayer
3b93bea9e3 matroskadec: Check EBML lace sizes. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-04 15:51:04 +02:00
Michael Niedermayer
115c3bc41f matroskadec: Check for overflows in xiph lace decoding 
This also detects errors earlier

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-04 15:17:57 +02:00
Michael Niedermayer
14de77d677 matroskadec: fix return code for too long xiph laces 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-04 15:13:53 +02:00
Michael Niedermayer
7ad359b394 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  xmv: do not leak memory in the error paths in xmv_read_header()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-04 14:35:40 +02:00