virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
36,367 Commits 37 Branches 400 Tags 465 MiB
45552371e3
Commit Graph

9153 Commits

Author SHA1 Message Date
Clément Bœsch
e1a8164d62 mp3enc: fix playback with mp3 encoded files on some devices. 
This partially reverts 1fea432b; header variable needs to keep its value
in case it triggers "if (needed <= c.frame_size)".
 2012-01-02 15:34:03 +01:00
Jean First
e2c1d3ec41 flvdec: use av_uninit to silence compiler warnings 
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-02 03:38:58 +01:00
Paul B Mahol
dfa77dead2 y41p encoder and decoder 
y41p is a packed 12-bit 4:1:1 YUV format used by Brooktree.

Fixes issue 1123 / ticket #102.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-02 03:35:23 +01:00
Jean First
6bd8d61378 mov: av_dlog use PRId64 instead of %ld 
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-01 21:19:07 +01:00
Jean First
d92d2af81f mxfdec: change av_log formatting %lx to PRIx64 and %li to PRIi64 
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-01 21:15:46 +01:00
Michael Niedermayer
490c97bdf5 mpegpsenc: Fix integer overflow of the muxrate calculation. 
this should fix the failure of h264-bsf-mp4toannexb on freebsd/openbsd

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-01 03:50:43 +01:00
Michael Niedermayer
4478e9d8db Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  FATE: add tests for dfa
  mpegaudiodec: fix seeking.
  mpegaudiodec: fix compilation when testing the unchecked bitstream reader
  threads: add sysconf based number of CPUs detection
  threads: always include necessary headers for number of CPUs detection
  threads: default to automatic thread count detection
  Changelog: restore version <next> header
  cook: K&R formatting cosmetics

Conflicts:
	Changelog
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-01 00:07:31 +01:00
Carl Eugen Hoyos
2cba62bd84 Do not map asf metadata key WM/Track to track. 
WM/Track is 0-based (and deprecated in favour of WM/TrackNumber),
track is 1-based.

Fixes ticket #825.
 2011-12-31 22:33:58 +01:00
Janne Grunau
e4e30256f8 threads: default to automatic thread count detection 2011-12-31 17:40:12 +01:00
Michael Niedermayer
bd553d5ea9 mxg: fix compiler warning for uninitialized variables 
Based on work by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-31 17:15:31 +01:00
Jean First
acc88f07d4 id3v2: fix compiler warning for uninitialized variables 
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-31 17:15:31 +01:00
Michael Niedermayer
e6362f3a3c lavf: ffio_limit(), treat avio_size()==0 as error. 
This works around issues arising from inputs that claim to have a
filesize of 0.

Reported-by: buzz_
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-31 15:35:39 +01:00
Michael Niedermayer
5500e65342 flvdec: Check avpriv_mpeg4audio_get_config() return 
value before using its output.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-31 04:54:26 +01:00
Jean First
b6ffceefb5 mpegts: remove unused variable 
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-31 02:27:11 +01:00
Jean First
8aed73c355 movenc: remove unused variables 
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-31 02:27:11 +01:00
Jean First
576ada791a cache: use av_freep instead of av_free in cache_open 
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-31 02:27:10 +01:00
Jean First
3ceb4c907e cache: remove unused variable in cache_open 
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-31 02:27:10 +01:00
Michael Niedermayer
bace181b48 flvdec: Add comment about the 5 second threshold 
Idea-by: Reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-30 20:34:55 +01:00
Paul B Mahol
ba10207bbe Use more designated initializers. 
Also remove some pointless NULL/0 assigments.

C++ code must be left as it is because named struct
initializers are not supported by C++ standard.
 2011-12-30 20:00:53 +01:00
Paul B Mahol
73ba2c1e62 mp3enc: remove unused variable 2011-12-30 19:42:59 +01:00
Michael Niedermayer
83f70805c0 flvdec: Print a warning in all failure cases of parse_keyframes_index() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-30 04:29:56 +01:00
Michael Niedermayer
67c734ea5c flvdec: Disable metadatacreator "MEGA" hack 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-30 04:29:55 +01:00
Michael Niedermayer
df0bff6643 flvdec: Check index for being valid 
Fixes seeking in Enigma_Principles_of_Lust.flv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-30 04:29:54 +01:00
Michael Niedermayer
00c0465dbc Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  fate: split off DPCM codec FATE tests into their own file
  fate: split off PCM codec FATE tests into their own file
  libvorbis: K&R reformatting cosmetics
  libmp3lame: K&R formatting cosmetics
  fate: Add a video test for xxan decoder
  mpegvideo_enc: K&R cosmetics (line 1000-2000).
  avconv: K&R cosmetics
  qt-faststart: Fix up indentation
  indeo4: remove two unused variables
  doxygen: cleanup style to support older doxy
  fate: add more tests for VC-1 decoder
  applehttpproto: Apply the same reload interval changes as for the demuxer
  applehttp: Use half the target duration as interval if the playlist didn't update
  applehttp: Use the last segment duration as reload interval
  lagarith: add decode support for arith rgb24 mode

Conflicts:
	avconv.c
	libavcodec/libmp3lame.c
	libavcodec/mpegvideo_enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-30 03:46:24 +01:00
Michael Niedermayer
b9e0e9537a nsvdec: Check av_malloc(string_size) 
This can easily be NULL as string_size can be 2g in a damaged file.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-30 01:44:47 +01:00
Michael Niedermayer
bf5cc80519 issdemux: Check packet_size for validity 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-29 15:25:07 +01:00
Andrey Utkin
1f8bf1ef38 applehttpproto: Apply the same reload interval changes as for the demuxer 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-12-29 11:42:55 +02:00
Martin Storsjö
617475a95c applehttp: Use half the target duration as interval if the playlist didn't update 
This is mandated in draft-pantos-http-live-streaming-07, section
6.3.4.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-12-29 11:42:45 +02:00
Andrey Utkin
356ae5f65b applehttp: Use the last segment duration as reload interval 
According to draft-pantos-http-live-streaming-07, 6.3.4,
the duration of the last media segment in the playlist
should be used as initial minimum reload delay.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-12-29 11:42:21 +02:00
Michael Niedermayer
6071e4d87a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  v410dec: Check for sufficient input data. Fixes crash
  fate: Add v210 codec regression tests
  mpegts: adjustable minimum PES payload
  mpegts: properly output large audio packets
  avformat: Add SMJPEG demuxer.
  Indeo 4 decoder

Conflicts:
	doc/general.texi
	libavcodec/v410dec.c
	libavcodec/version.h
	libavformat/mpegtsenc.c
	libavformat/smjpeg.c
	libavformat/version.h
	tests/codec-regression.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-29 01:40:34 +01:00
Jindřich Makovička
891ce00c8d mpegts: adjustable minimum PES payload 
With the current default PES packet size, and very small audio bitrates,
audio packet duration gets too long. For players, which wait for a whole
audio packet (or more) it takes a very long time to start playing sound.

For 24kbps audio, one PES packet is about 1 second long. On Motorola STBs,
we observe about 3 second delay before the playback starts with the
default setting.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-12-28 20:31:54 +01:00
Jindřich Makovička
6fa9843b4b mpegts: properly output large audio packets 
Do not assume the audio packets being always smaller than
DEFAULT_PES_PAYLOAD_SIZE.

Signed-off-by: Jindřich Makovička <makovick@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-12-28 20:31:15 +01:00
Paul B Mahol
b5aecc6bc0 avformat: Add SMJPEG demuxer. 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-12-28 20:17:20 +01:00
Carl Eugen Hoyos
ec0dc7e2e0 Make Interplay palette opaque and increase its dynamics. 2011-12-27 18:26:31 +01:00
Marton Balint
7b2dba1c50 dv: fix avpriv_dv_codec_profile with lowres > 0 
Fixes ticket #44.

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-26 22:12:20 +01:00
Michael Niedermayer
084bd109fc id3v2: fix variable type for uncompress() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-26 22:12:20 +01:00
Adrian Drzewiecki
7e09fe15d5 Process compressed id3v2 tags. 
ID3v2.4 allows for zlib compressed tags, but libavformat skips them.
Implement code to inflate compressed tags.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-26 22:12:20 +01:00
Clément Bœsch
3701d547ac gxf: remove gxf_ prefix to timecode metadata keys. 
This will allow a shared "timecode" key metadata between formats to ease
third-party extraction.
 2011-12-26 11:22:29 +01:00
Matthieu Bouron
357cb53306 dv: add timecode to metadata 
Reviewed-by: Reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-26 05:46:29 +01:00
Michael Niedermayer
1795fed7bc segafilm: fail earlier in case theres not enough bytestream left for a 
audio packet.
This prevents a potentially large memory allocation.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-25 04:49:23 +01:00
Michael Niedermayer
27d323577c avio: Fix ffio_limit() when due to seeking past the end less than 0 bytes remain. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-25 04:48:26 +01:00
Michael Niedermayer
0d4404ed65 asfdec: fix endless loop on EOF 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-24 23:21:40 +01:00
Michael Niedermayer
47c4713a23 sierravmd: limit packetsize to the amount that could be read. 
Fixes huge allocations.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-24 22:06:25 +01:00
Michael Niedermayer
66f71f3b5e rmdec: Avoid allocating huge packets 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-24 21:26:52 +01:00
Michael Niedermayer
43abef9fde rpl: Fix near infinite loop in index reading due to missing eof check. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-24 19:57:18 +01:00
Carl Eugen Hoyos
32c49389bc Make the palette in Quake II CIN files opaque and increase its dynamics. 2011-12-24 12:44:30 +01:00
Carl Eugen Hoyos
0d59ae32c2 Make mov palette opaque or load alpha if present. 2011-12-24 12:38:32 +01:00
Carl Eugen Hoyos
64cafe340b Make the avi palette opaque. 2011-12-24 03:41:50 +01:00
Michael Niedermayer
ad9e0ed170 avio: fix handling of , in urls 
Fixes Ticket805

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-23 23:59:10 +01:00
Michael Niedermayer
8ff4fff774 flvdec: disable new midstream param change code not only for h264 but all cases. 
It breaks some samples and iam not aware of one that it fixes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-23 23:06:56 +01:00