generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
41,012 Commits 24 Branches 241 Tags
Commit Graph

10171 Commits

Author SHA1 Message Date
Michael Niedermayer
45a7b0674d oggvorbis: fix the first 2 packets timestamps matching issue 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-05 10:57:53 +02:00
Martin Storsjö
44f99fe0f5 rtpdec_h264: Remove a useless ifdef 
assert is a no-op if DEBUG isn't defined.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-05 03:10:25 +03:00
Martin Storsjö
8d43b8b8e8 rtpdec_h264: Remove outdated/useless/incorrect comments 
RTCP is handled elsewhere, not in the depacketizer for an
individual format.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-05 03:10:15 +03:00
Martin Storsjö
5a571d3241 rtpdec_h264: Remove useless memory corruption checks 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-05 03:09:53 +03:00
Martin Storsjö
b7b7354c33 rtpdec_h264: Return proper error codes 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-05 03:09:44 +03:00
Martin Storsjö
5245adb963 rtpdec_h264: Check the available data length before reading 
This makes sure the length is checked for STAP-A type packets.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-05 03:09:10 +03:00
Ivan Kovtunov
de26a4b699 rtpdec_h264: Add input size checks 
This fixes crashes if given too short data packets.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-05 03:09:07 +03:00
Michael Niedermayer
441dce2169 oggvorbis: move handling of first packets ts from parser to muxer. 
The parser does not have enough knowledge it seems to do it
correctly.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-05 01:52:21 +02:00
Ronald S. Bultje
273e6af47b ea: check chunk_size for validity. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-05-04 16:06:26 -07:00
Michael Niedermayer
bce42e95d1 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: add POWER[5-7] support
  arm: intreadwrite: revert 16-bit load asm to old version for gcc < 4.6
  vqavideo: return error if image size is not a multiple of block size
  cosmetics: indentation
  avformat: only fill-in interpolated timestamps if duration is non-zero
  avformat: remove a workaround for broken timestamps

Conflicts:
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-05 00:54:28 +02:00
Michael Niedermayer
b18c9f1eb0 oggtheora: Port changes from oggvorbis timestamp handling. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-05 00:00:40 +02:00
Michael Niedermayer
fe5c5bccce oggvorbisdec: Apply timestamp calculation always when timestamps arent known. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-05 00:00:40 +02:00
Michael Niedermayer
1f95ad48ff oggvorbisdec: redesign special handling of first frames timestamp. 
This also will make it possible to use the code for cases other than the start of a stream

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-04 23:59:26 +02:00
Michael Niedermayer
63eb01d9c1 oggvorbis: Try to fix pts off by 1 issue. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-04 15:49:37 +02:00
Michael Niedermayer
231d32c8d7 oggtheora: Fix initial pts 
code based on the solution in vorbis

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-04 14:40:22 +02:00
Michael Niedermayer
49d935b5d2 seek-test: support printing multiple packets 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-04 14:40:22 +02:00
Michael Niedermayer
ef32fbafcd oggdec: fix off by one error on pos_limit 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-04 14:40:22 +02:00
Michael Niedermayer
a6bb09fc1a oggdec: print error on failure to create streams 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-04 14:40:22 +02:00
Michael Niedermayer
251ce23165 oggdec: print error on changing streams when its unsupported. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-04 14:40:22 +02:00
Michael Niedermayer
6fd478062c oggdec: print error on unsupported versions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-04 14:40:22 +02:00
Michael Niedermayer
96fb233e64 oggdec: reset lastpts so that justins vorbis duration correction is not skiped 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-04 14:40:22 +02:00
Michael Niedermayer
5f9f78dc9b oggdec: pass avformat context to ogg_reset() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-04 14:40:21 +02:00
Michael Niedermayer
babf2a3467 seek-test: support manually forcing a seek to a specific position 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-04 14:40:21 +02:00
Justin Ruggles
e5356ebf22 cosmetics: indentation 2012-05-03 16:28:08 -04:00
Justin Ruggles
8916f1fbcb avformat: only fill-in interpolated timestamps if duration is non-zero 
This avoids returning duplicate timestamps for multiple packets when the
demuxer does not provide all timestamps and packet duration is not known.
 2012-05-03 16:28:08 -04:00
Justin Ruggles
ff499157a1 avformat: remove a workaround for broken timestamps 
This modifies pts in situations other than what was intended, leading to
invalid timestamps.

Reverts commit 90bb394dccacd10607153833a0aeba0d970dc8db
 2012-05-03 16:28:08 -04:00
Clément Bœsch
9ae570fb5f JACOsub demuxer, decoder and muxer. 2012-05-03 19:37:14 +02:00
Joakim Plate
68b9ed8391 mpegts: Some additional HDMV types and reg descriptors for mpegts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-05-03 12:13:28 -04:00
Reimar Döffinger
20044cd9a9 flvdec: pass on proper error value. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-05-01 23:20:52 +02:00
Reimar Döffinger
8f63f241d4 Remove some useless code that duplicates av_get_packet. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-05-01 23:20:52 +02:00
Reimar Döffinger
7effbee66c Mark truncated packets as corrupt in av_get_packet. 
Manually remove that flag again for formats that read an arbitrary
amount of data and thus truncation is not an error.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-05-01 23:20:52 +02:00
Michael Niedermayer
39de8343f9 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mkv: mark corrupted packets and return them
  mkv: forward EMBL block data error
  avcodec: introduce YCoCg colorspace
  avcodec: cosmetic cleanup on header
  aac sbr: align struct member by 32 byte.

Conflicts:
	libavcodec/avcodec.h
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-30 22:18:43 +02:00
Michael Niedermayer
e738811ceb lavf: add AVFMT_SEEK_TO_PTS to indicate seeking is per PTS. 
See: [FFmpeg-devel] [PATCH] Add documentation that seeking is done by DTS and not PTS

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-30 15:47:58 +02:00
Luca Barbato
0ca4642ec5 mkv: mark corrupted packets and return them 
Do return error if memory allocation or I/O fails.
 2012-04-29 20:22:09 -07:00
Luca Barbato
721af294d9 mkv: forward EMBL block data error 
Do not return 0 on error.
 2012-04-29 20:22:09 -07:00
Michael Niedermayer
bcc213cf36 isom: remove duplicate line. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-30 03:49:32 +02:00
Derek Buitenhuis
9ea5756dae isom: Clarify comment for 'ec-3' fourcc 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-30 03:49:32 +02:00
Reimar Döffinger
755667eebc rmenc: more than 2 streams are not currently possible. 
It is possible that just extending the RMMuxContext.streams
array would avoid it.
It is also possible that two audio streams will fail to mux
correctly as well, though at least it should not crash for
this reason.
I do not feel like checking either of these.
This patch fixes trac issue #1022 (at least it makes it
exit with a proper error message instead of crashing).

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-04-29 13:03:15 +02:00
Reimar Döffinger
370211f470 nutdec: minor simplification. 
Also fixes an (incorrect) "control reaches end of non-void function"
warning with some compilers.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-04-29 13:03:15 +02:00
Reimar Döffinger
1d128e5814 nutdec: replace assert with av_assert0. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-04-29 13:03:15 +02:00
Michael Niedermayer
9d7c1b4cf3 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  h264: new assembly version of get_cabac for x86_64 with PIC
  h264: use one table instead of several for cabac functions
  h264: (trivial) remove unneeded macro argument in x86/cabac.h
  libschroedingerdec: check malloc
  segment: reorder seg_write_header allocation
  avio: make avio_close(NULL) a no-op
  mov: Parse EC3SpecificBox (dec3 atom).

Conflicts:
	libavcodec/cabac.c
	libavcodec/x86/cabac.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-28 20:45:06 +02:00
Jean First
64943b47e7 lavf remove duplicated check in has_duration 
this hunk was merged in 8b97ae64 and cbf767a8 although the check was there a
few lines above since cdced09e. I removed the first check to reduce the differences
to libav.

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-28 19:07:30 +02:00
Nicolas George
12eeced8b4 avio: change ffurl_alloc return code. 
If the designated protocol is not found, return
AVERROR_PROTOCOL_NOT_FOUND instead of AVERROR(ENOENT).
 2012-04-28 16:39:54 +02:00
Luca Barbato
3b52e9da10 segment: reorder seg_write_header allocation 
As pointed by Paul B Mahol <onemda@gmail.com> the previous code could
lead to null pointer dereference.
 2012-04-27 14:03:43 -07:00
Luca Barbato
e1e146a2d1 avio: make avio_close(NULL) a no-op 
Its behaviour in line with ffurl_close(NULL).
 2012-04-27 14:03:43 -07:00
Michael Niedermayer
28c5775183 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mpegts: Make sure we don't return uninitialized packets
  gitignore: replace library catch-all pattern by more specific patterns

Conflicts:
	.gitignore

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-27 22:44:52 +02:00
Yusuke Nakamura
546adc1fee mov: Parse EC3SpecificBox (dec3 atom). 
Skip to parse fields for additional independent substreams and its
associated dependent substreams since libavcodec's E-AC-3 decoder does not
support them yet.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-04-27 16:11:46 -04:00
Clément Bœsch
e40981b8c4 lavf/microdvd: set packet duration. 2012-04-27 19:19:36 +02:00
Martin Storsjö
df8aa4598c mpegts: Make sure we don't return uninitialized packets 
This fixes crashes, where the demuxer could return 0 even
if the returned AVPacket isn't initialized at all. This
could happen if running into EOF or running out of probesize
with non-seekable sources.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-04-27 20:05:37 +03:00
Michael Niedermayer
e890b68962 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  dsputil: fix invalid array indexing
  configure: add libavresample to rpath
  build: icc: silence some warnings
  fft-test: add option to set cpuflag mask
  cpu: recognise only cpu flag names pertinent to the architecture
  avutil: add av_parse_cpu_flags() function
  vp8: armv6: fix non-armv6t2 build
  vp8: armv6 optimisations
  vp8: arm: separate ARMv6 functions from NEON
  ARM: add some compatibility macros
  mov: support eac3 audio
  avf: fix faulty check in has_duration

Conflicts:
	configure
	doc/APIchanges
	ffmpeg.c
	libavcodec/arm/Makefile
	libavcodec/arm/asm.S
	libavcodec/arm/vp8dsp_armv6.S
	libavcodec/arm/vp8dsp_init_arm.c
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-26 22:24:58 +02:00