virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
62,749 Commits 37 Branches 400 Tags 460 MiB
b3c0d010c3
Commit Graph

14967 Commits

Author SHA1 Message Date
Peter Ross
b3c0d010c3 avformat/mlvdec: close any additional .Mxx files 
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-27 15:34:27 +02:00
Peter Ross
8bd6837e51 avformat/mlvdec: remove unused MlvContext.buffer 
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-27 15:34:22 +02:00
Michael Niedermayer
466988ab75 Fix dont and doesnt typos 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-27 15:14:32 +02:00
Michael Niedermayer
e2a5557cbb Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  lavf/mpeg.h: Remove an unused definition.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-27 15:04:00 +02:00
Carl Eugen Hoyos
4abbea0243 lavf/mpeg.h: Remove an unused definition. 
Fixes a warning when compiling mpegts.c.
 2014-04-27 14:54:29 +02:00
Michael Niedermayer
e9ad121ba5 Fix skiping typos 
Found-by: Alessandro Ghedini <alessandro@ghedini.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-27 14:50:14 +02:00
Peter Ross
9abf08f79f avformat/mlvdec: print unsigned chunk size 
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-27 14:37:54 +02:00
Peter Ross
bdab0c2d76 avformat/mlvdec: process ff_get_wav_header return value 
Fixes CID1206640.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-27 14:37:18 +02:00
goodthanks
c9cfd45838 avformat/mpegtsenc: Allow DTS audio copy to TS streams 
This doesn't allow encoding of DTS or TrueHD. It just sets the correct
stream ID in the TS output file when a DTS or TrueHD audio stream is copied.

Fixes ticket #1398

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-27 14:24:29 +02:00
Carl Eugen Hoyos
ade5851be0 Try mov tags if the fourcc in V_MS/VFW mkv files cannot be found in bmp tags. 
Fixes decoding of broken mkv files containing ProRes video from ticket #3434.
 2014-04-27 12:52:34 +02:00
Michael Niedermayer
66e30a2e65 avformat/mpegtsenc: check avformat_new_stream() return 
Fixes CID1206645
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-26 22:08:37 +02:00
Michael Niedermayer
24725f8e09 avformat/matroskaenc: fix indention level 
Fixes CID1206644
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-26 22:01:48 +02:00
Michael Niedermayer
9b1d7d4fd3 avformat/oggparsecelt: fix memleak 
Fixes: CID1108605

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-26 21:31:15 +02:00
Michael Niedermayer
68de2115ca avformat/tee: print errors for each failed bitstream filter 
Fixes CID1108584

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-26 21:08:44 +02:00
Michael Niedermayer
af165acefa avformat/movenc: dont store invalid tapt atom 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-25 21:51:34 +02:00
Michael Niedermayer
c9e0f7a080 Merge commit '99e22b7859177f6d3ed6121040924b337dce5497' 
* commit '99e22b7859177f6d3ed6121040924b337dce5497':
  mov: Emit the correct tags for clcp tracks

Conflicts:
	libavformat/movenc.c

See: a5f6720f13
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-25 21:33:18 +02:00
Don Moir
62056d09b1 avformat/avidec: skip len=0 entries from the index 
Reduces cpu & memory requirements for the index
See Ticket 3531

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-25 18:56:05 +02:00
Miles Gould
99e22b7859 mov: Emit the correct tags for clcp tracks 
Bug-Id: 664

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-04-25 17:38:19 +02:00
Aidan Skinner
802385dbc2 mov: Write prof section of tapt tag 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-04-25 17:38:19 +02:00
Michael Niedermayer
e148a5820d Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Enable muxing ac-3 in caf.
  Use correct msvc type specifiers for ptrdiff_t and size_t.
  Fix vf_eq.c and vf_eq2.c compilation with !HAVE_6REGS.
  Fix libpostproc compilation with !HAVE_6REGS.
  Never write 0 as maximum bitrate for asf files.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-25 01:56:23 +02:00
Michael Niedermayer
ca9cc6fdcc Merge commit '152b797cd687e96a582a1cb908dddf3d330d7637' 
* commit '152b797cd687e96a582a1cb908dddf3d330d7637':
  flv: Do not mangle dts values for negative cts

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-24 21:50:28 +02:00
Michael Niedermayer
7da5ff5c18 Merge commit '5d983fdbca5570a1545a892583a372cfb3fffe92' 
* commit '5d983fdbca5570a1545a892583a372cfb3fffe92':
  flv: Warn only once

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-24 21:37:26 +02:00
Michael Niedermayer
277ae5a7b3 Merge commit '374fdc8c071dcd96422378b0a1a0d453336d8a01' 
* commit '374fdc8c071dcd96422378b0a1a0d453336d8a01':
  flv: Improve log messages

Conflicts:
	libavformat/flvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-24 21:27:09 +02:00
Carl Eugen Hoyos
18e7e21e2f Enable muxing ac-3 in caf. 
The files play fine with QuickTime.
 2014-04-24 18:02:20 +02:00
Carl Eugen Hoyos
ced0d6c14d Use correct msvc type specifiers for ptrdiff_t and size_t. 
The Windows runtime aborts if it finds %t or %z.
Fixes ticket #3472.

Reviewed-by: Ronald Bultje
 2014-04-24 18:01:30 +02:00
Carl Eugen Hoyos
eeee59ba4d Never write 0 as maximum bitrate for asf files. 
WMP refuses to play such streams.
 2014-04-24 17:47:49 +02:00
Michael Niedermayer
fc145e576a avformat/h263dec: Fix h263 probe 
The code was missing 1 bit in the src format

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-23 21:54:13 +02:00
Luca Barbato
152b797cd6 flv: Do not mangle dts values for negative cts 
Some applications really mean to send negative pts.
 2014-04-23 21:20:17 +02:00
Luca Barbato
5d983fdbca flv: Warn only once 
No point in sending the message multiple time.
 2014-04-23 21:19:27 +02:00
Luca Barbato
374fdc8c07 flv: Improve log messages 
Messages should start with a capital letter and possibly end with a "."
if they are statements.
 2014-04-23 21:04:20 +02:00
Michael Niedermayer
56efd98a65 Merge commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd' 
* commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd':
  On2 AVC decoder

Conflicts:
	Changelog
	configure
	libavcodec/avcodec.h
	libavcodec/codec_desc.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-23 20:47:13 +02:00
Kostya Shishkov
e2834567d7 On2 AVC decoder 2014-04-23 19:57:44 +02:00
kyh96403
f21c263c89 avformat/rtmppkt: Fix random crash 
Fixes Ticket3564

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-23 15:10:42 +02:00
Michael Niedermayer
dc6a17cf74 avformat/mux: Check for and remove invalid packet durations 
Fixes assertion failure
Fixes Ticket3575

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-23 06:55:33 +02:00
Michael Niedermayer
b9017fdd42 avformat/flvdec: also include file position in debug output 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-23 03:55:41 +02:00
Reimar Döffinger
3bd7a7149f Add missing ';'. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-04-22 20:44:31 +02:00
Reimar Döffinger
8cbf0827e1 Various small spelling fixes. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-04-22 20:44:31 +02:00
Michael Niedermayer
f1c48c3a4d avformat/mpegtsenc: make the pes packet length omission optional 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 16:11:12 +02:00
Graham Booker
60fcc19b90 avformat/mpegtsenc: Changed Video PES packet length to 0. 
The rational for this is another issue that plex has exposed.  When it is
conducting a transcode of video to HLS for streaming, my father noticed
artifacts when played on his GoogleTV (NSZ-GT1).  He sent me a test file
and I reproduced it on my device of the same model.  It is important to
note that the artifacts were not present when streaming to VLC or QuickTime
Player.  I copied the command-line that plex used, and conducted all of the
following tests using FFmpeg git.

Transcode to HLS: artifacts on playback
Transcode to TS: playback is fine
Cat HLS segments into a single TS: playback is fine
Segment single TS file to segments: artifacts on playback
Segment single TS file to segments using Apple's HLS segmenter: playback is
fine

At this point I carefully examined the differences between Apple's HLS
segmenter output and FFmpeg's.  Among the considerable differences, I
noticed that the video PES packets always had a 0 length.  So I continued:

Transcode to HLS using FFmpeg with 0 length PES packets: playback is fine.
Segment single TS to segments with 0 length PES packets: playback is fine.

All failures mentioned are only on the GTV since it is the only player on
which I could reproduce artifacts.  I only tested the GTV, VLC, and
QuickTime Player though, so my test case is limited.  I do not know if
other players exhibit this issue.

Since it was useful last time, I have uploaded the test file as
hls_pes_packet_length.m4v along with its associated txt file which contains
the transcode command-line that was used.

Reviewed-by: Kieran Kunhya <kierank@obe.tv>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 16:05:25 +02:00
Michael Niedermayer
8064c6ac5f Merge commit 'f9157463dbcd2db8fe9504197c0c04d0d7d04f31' 
* commit 'f9157463dbcd2db8fe9504197c0c04d0d7d04f31':
  lavf: do not use the parser duration for video

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 13:56:29 +02:00
Michael Niedermayer
57123dc67e Merge commit 'a4ed995cabf220029f1d0e185a6fb45eed7b4091' 
* commit 'a4ed995cabf220029f1d0e185a6fb45eed7b4091':
  txd: do not set the codec timebase.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 13:30:23 +02:00
Anton Khirnov
f9157463db lavf: do not use the parser duration for video 
The parser has no way of knowing video duration, and therefore no video
parsers set it.
 2014-04-22 07:46:03 +02:00
Anton Khirnov
a4ed995cab txd: do not set the codec timebase. 
It is not supposed to be changed from outside of lavc.
Set the stream timebase and average framerate instead.
 2014-04-22 07:44:16 +02:00
Michael Niedermayer
57fb570908 avformat/avidec: Speed up keyframe detection code 
Fixes Ticket3531

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 04:33:20 +02:00
Michael Niedermayer
f3743901d7 avformat: Fix decoder search in find stream info 
Fixes Ticket3548

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-21 05:27:08 +02:00
Michael Niedermayer
369cdf917a avformat/asfenc: dont allow non interleaved packets 
The muxer does not support this currently

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-21 02:49:05 +02:00
Michael Niedermayer
5b19fc7aae avformat/pmpdec: remove cur_dts timestamp hack 
It appears the demuxer works fine without it

Fixes Ticket3534

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-21 01:29:08 +02:00
Lukasz Marek
4d09bc9897 lavf/pcm: remove redundant check 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-20 20:56:02 +02:00
Peter Ross
f57ac37228 avformat/iff: extend IFF demuxer to decode DSDIFF 64-bit chunks 
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-20 00:22:20 +02:00
Michael Niedermayer
01a39a978c Merge commit '55ddd700c67529ff2c6c4e976673f1341bba7a82' 
* commit '55ddd700c67529ff2c6c4e976673f1341bba7a82':
  Silicon Graphics Movie demuxer

Conflicts:
	Changelog
	libavformat/mvdec.c
	libavformat/version.h

See: 6fb40779cd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-19 20:17:33 +02:00