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

56472 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
c16470d77a Merge commit '5f408333601a827054335f309defcb246a532b21' 
* commit '5f408333601a827054335f309defcb246a532b21':
  asfdec: substract preroll time from marker presentation time

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-20 10:57:20 +02:00
Monty Montgomery
f6622f9610 avformat/matroskadec: correct spurious keyframe warnings in webm 
Minor change to fix for Trac #1003 to avoid squawking about files
with valid keyframes that aren't marked (as opposed to frames that are
marked as keyframes and aren't).

Change correctly surpresses the spurious warnings, while still complaining
about (and handling) the genuinely broken file attached to bug #1003.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-20 03:45:02 +02:00
Paul B Mahol
3e2a5b33f0 avformat/matroskadec: use av_malloc_array() and check for allocation error 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-19 22:28:25 +00:00
Michael Niedermayer
13eff473ad swscale/swscale_unscaled: fix alpha values for rgb/bgr -> RGB32_1 / BGR32_1 
Found-by: Justin Ruggles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-19 23:15:51 +02:00
Michael Niedermayer
1225b67fc9 avutil/frame: suppress "comparison of unsigned expression < 0 is always false" warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-19 22:46:52 +02:00
Michael Niedermayer
9c8aeacf82 avutil: add av_get_colorspace_name() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-19 22:14:13 +02:00
Michael Niedermayer
63139f62f3 avformat/bmv: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-19 22:04:34 +02:00
Paul B Mahol
20101f4a83 avfilter/vf_decimate: add gray16 and yuv440p 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-19 17:53:05 +00:00
Paul B Mahol
0ad5ef674b avfilter/vf_decimate: fix crash with gray8 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-19 17:50:42 +00:00
Vladimir Pantelic
5f40833360 asfdec: substract preroll time from marker presentation time 
this was forgotten when we changed ASF to not output the preroll time

Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-09-19 19:37:28 +02:00
Paul B Mahol
1f5d1342ea doc: Add missing hashes and dates to APIChanges 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-19 16:57:48 +00:00
Paul B Mahol
390c35a13b lavfi/mp: remove mp=qp 
The filter does nothing.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-19 15:53:45 +00:00
Michael Niedermayer
ad2a08388c avformat/concat: revert one hunk of 20dfab33f5ab61fc51de65192ed239f8b62782a2 
The deallocated memory contains resources that need to be freed before it
can be deallocated. The original code was correct.
This also fixes a double free

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-19 15:18:15 +02:00
Michael Niedermayer
8be56e464b avformat/smacker: Check if bufs has been allocated before use 
Fixes null pointer dereference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-19 14:20:21 +02:00
Michael Niedermayer
93648ee47b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rv34: Fix a memory leak on errors

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-19 13:49:17 +02:00
Michael Niedermayer
52dc3600a9 Merge commit 'bcbe4f3ceb6ee0210d3a401963518906c8b9b230' 
* commit 'bcbe4f3ceb6ee0210d3a401963518906c8b9b230':
  idroqdec: Make sure a video stream has been allocated before returning packets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-19 13:34:25 +02:00
Michael Niedermayer
b4c88a4c4c Merge commit '5372cda67109848d22146289e401669266217e80' 
* commit '5372cda67109848d22146289e401669266217e80':
  rv10: Validate the dimensions set from the container

This check could be replaced by a width==0||height==0

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-19 13:28:32 +02:00
Michael Niedermayer
374a2f4562 Merge commit 'ae0f316a4778e473d407cffa8392595ba0735153' 
* commit 'ae0f316a4778e473d407cffa8392595ba0735153':
  rtmp: Unbreak handle_notify

See: fbd54827b1be23c1a234210df5cc876665fbd941
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-19 13:03:19 +02:00
Michael Niedermayer
32ea39f56d Merge commit '1914e6f010b3320025c7b692aaea51d9b9a992a8' 
* commit '1914e6f010b3320025c7b692aaea51d9b9a992a8':
  aacdec: Add support for LD (Low Delay) AAC

Conflicts:
	Changelog
	libavcodec/aacdec.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-19 12:55:26 +02:00
Michael Niedermayer
257f11820b Merge commit '5cdefc02079a5b899bdec09e15e2bb099cb01734' 
* commit '5cdefc02079a5b899bdec09e15e2bb099cb01734':
  aacdec: Add support for Error Resilience syntax.

Conflicts:
	Changelog
	libavcodec/aacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-19 12:44:06 +02:00
Michael Niedermayer
b26ccf218d Merge commit 'c4bfa098072ba338d83555d6e2199f7e1e64ffff' 
* commit 'c4bfa098072ba338d83555d6e2199f7e1e64ffff':
  Add a WebP decoder

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/avcodec.h
	libavcodec/version.h
	libavformat/img2.c

The previously existing webp decoder is disabled as the new
one supports lossless mode and alpha while the previous does not.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-19 12:36:11 +02:00
Michael Niedermayer
ac2fc63ac6 Merge commit '9ae53c5860e17d087642d27b00dade071970a2e7' 
* commit '9ae53c5860e17d087642d27b00dade071970a2e7':
  lavc: add ff_u8_to_s8() for safe type punning of uint8_t to int8_t

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-19 11:47:40 +02:00
Luca Barbato
fbd54827b1 rtmp: Unbreak handle_notify 
Commit 5626f994f273af80fb100d4743b963304de9e05c broke it.
 2013-09-19 11:27:21 +02:00
Michael Niedermayer
20dfab33f5 Merge commit '5626f994f273af80fb100d4743b963304de9e05c' 
* commit '5626f994f273af80fb100d4743b963304de9e05c':
  avformat: Use av_reallocp() where suitable

Conflicts:
	libavformat/avidec.c
	libavformat/avienc.c
	libavformat/aviobuf.c
	libavformat/oggparsevorbis.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-19 11:01:26 +02:00
Michael Niedermayer
f54d751f33 Merge commit '0f310a6f333b016d336674d086045e8473fdf918' 
* commit '0f310a6f333b016d336674d086045e8473fdf918':
  rmdec: Validate the fps value

Conflicts:
	libavformat/rmdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-19 10:38:40 +02:00
Stefano Sabatini
f0606a28de ffprobe: add -read_intervals option 
This is also useful to test seeking on an input file.

This also addresses trac ticket #1437.
 2013-09-19 10:10:30 +02:00
Martin Storsjö
fdbd924b84 rv34: Fix a memory leak on errors 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-09-19 11:09:18 +03:00
Martin Storsjö
bcbe4f3ceb idroqdec: Make sure a video stream has been allocated before returning packets 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-09-19 11:09:04 +03:00
Martin Storsjö
5372cda671 rv10: Validate the dimensions set from the container 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-09-19 11:08:54 +03:00
Stefano Sabatini
6230a95659 doc/muxers: itemize tee examples 
Improve rendering.
 2013-09-19 10:07:53 +02:00
Luca Barbato
ae0f316a47 rtmp: Unbreak handle_notify 
Commit 5626f994f273af80fb100d4743b963304de9e05c broke it.
 2013-09-19 09:13:04 +02:00
James Almer
ea70e2f2d7 matroskaenc: Write muxingapp and writingapp elements when using bitexact flag 
Files won't validate with mkvalidtor if these two elements are missing.
Use a const "Lavf" string that wont change with library version bumps.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-18 23:06:59 +02:00
James Almer
93439e8b6f fate: Fix exif tests ffprobe dependency 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-18 22:59:40 +02:00
James Almer
164e0e544f doc/APIchanges: Fix two hashes 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-18 22:50:52 +02:00
Paul B Mahol
2e35686030 avfilter/vf_telecine: remove redudant av_frame_copy_props() 
It is already called by av_frame_clone().

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-18 19:17:34 +00:00
Alex Converse
1914e6f010 aacdec: Add support for LD (Low Delay) AAC 2013-09-18 12:01:53 -07:00
Alex Converse
5cdefc0207 aacdec: Add support for Error Resilience syntax. 
This does not add support for any error resilience tools.
 2013-09-18 12:01:49 -07:00
Justin Ruggles
c4bfa09807 Add a WebP decoder 
Container and lossy decoding by Aneesh Dogra <aneesh@sugarlabs.org>
Lossless decoding by Justin Ruggles <justin.ruggles@gmail.com>
 2013-09-18 14:10:05 -04:00
Justin Ruggles
9ae53c5860 lavc: add ff_u8_to_s8() for safe type punning of uint8_t to int8_t 2013-09-18 14:10:05 -04:00
Alexandra Khirnova
5626f994f2 avformat: Use av_reallocp() where suitable 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-09-18 18:28:38 +02:00
Paul B Mahol
7f4a5006ce avfilter/vf_pullup: remove junk_down nonsense 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-18 12:47:57 +00:00
Paul B Mahol
d520055000 avfilter/vf_pullup: change log level to error 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-18 11:56:36 +00:00
Paul B Mahol
fe5b7612c0 avfilter/vf_pullup: fix memleak of metrics for last PullupField 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-18 11:56:35 +00:00
Michael Niedermayer
b7e7d8cdaf Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  movenc: Add an option for omitting the tfhd base offset

Conflicts:
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-18 13:32:55 +02:00
Paul B Mahol
394a73cad2 avfilter/vf_pullup: make sure metric_plane is available 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-18 11:27:41 +00:00
Paul B Mahol
8302abf844 lavfi/mp: remove mp=pullup 
The filter was ported to a native libavfilter filter.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-18 11:05:27 +00:00
Michael Niedermayer
66e199bd75 Merge commit 'a4adabb460ace39783d707a5b3bbe28b4b5b9dc4' 
* commit 'a4adabb460ace39783d707a5b3bbe28b4b5b9dc4':
  movenc: Write the moof atom in two passes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-18 12:47:55 +02:00
Michael Niedermayer
015f7ce7d7 Merge commit 'c77d409bf95954aceb762dd800d1ee2868c4b0d4' 
* commit 'c77d409bf95954aceb762dd800d1ee2868c4b0d4':
  twinvqdec: Check the ibps parameter separately

See: b8dc5f8bb3b14bfd2289a0444c7b706299555d97
See: 98b377004d9c6fa1c1756c814efe9882b65f96b9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-18 12:42:19 +02:00
Michael Niedermayer
4131a3cb58 Merge commit '8583b14252deac71136f1dec231910abab0ba503' 
* commit '8583b14252deac71136f1dec231910abab0ba503':
  rtmp: Support reading interleaved chunks.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-18 12:09:06 +02:00
Michael Niedermayer
46cc498b77 Merge commit 'd4c2a3740fb95f952a87ba320d2bf31f126bdf68' 
* commit 'd4c2a3740fb95f952a87ba320d2bf31f126bdf68':
  xmv: Add more sanity checks for parameters read from the bitstream

Conflicts:
	libavformat/xmv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-18 11:24:27 +02:00