wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
60527 commits 40 branches 405 tags 230 MiB
Commit graph

60527 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christophe Gisquet
c3390fd56c ra144: use scalarproduct_int16 
The buffer holding the coefficients must be padded with 0 so as to use DSP
functions that may overread. Currently, the SSE2/3 versions is an example,
as they process batches of 16 bytes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 21:45:55 +01:00
Michael Niedermayer
dfc99ca04d Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rpza: limit the number of blocks to the total remaining blocks in the frame

See: 3819db745d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 21:28:38 +01:00
Michael Niedermayer
996fdca8fb Merge commit 'a46dc49744' 
* commit 'a46dc49744':
  rpza: move some variables to the blocks where they are used

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 20:46:03 +01:00
Michael Niedermayer
0a4311dee5 Merge commit 'c7769df178' 
* commit 'c7769df178':
  rpza: use fixed-width int types

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 20:41:00 +01:00
Michael Niedermayer
8b0befe451 Merge commit 'e1218ce914' 
* commit 'e1218ce914':
  rpza: switch to bytestream2

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 20:32:15 +01:00
Michael Niedermayer
3868e97c6b ffmpeg: fix vstats 
Broken by: 394fb56c29
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 20:31:06 +01:00
Michael Niedermayer
8560fdc451 Merge commit '394fb56c29' 
* commit '394fb56c29':
  lavf: always unref the packet passed to av_interleaved_write_frame() on error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 20:30:58 +01:00
Michael Niedermayer
e93674c4a3 doc/APIchanges: fill in FFmpeg hashes & versions 
Entries that have no hash at all are not filled in

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 19:10:12 +01:00
Zhang Rui
4958628ba6 avformat/concatdec: pass the interrupt callback on 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 15:42:48 +01:00
Anton Khirnov
77bb0004bb rpza: limit the number of blocks to the total remaining blocks in the frame 
Fixes invalid writes.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
 2014-02-10 15:22:28 +01:00
Anton Khirnov
a46dc49744 rpza: move some variables to the blocks where they are used 2014-02-10 15:22:01 +01:00
Anton Khirnov
c7769df178 rpza: use fixed-width int types 2014-02-10 15:21:35 +01:00
Anton Khirnov
e1218ce914 rpza: switch to bytestream2 2014-02-10 15:18:21 +01:00
Anton Khirnov
394fb56c29 lavf: always unref the packet passed to av_interleaved_write_frame() on error 2014-02-10 15:08:06 +01:00
Michael Niedermayer
1c1bb203dd Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  build: fix examples compilation when EXESUF is not empty

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 14:24:15 +01:00
Michael Niedermayer
ec8e232b53 Merge commit '18c896be3d' 
* commit '18c896be3d':
  lavf: extend / improve the AVFormatContext doxy

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 14:18:47 +01:00
Michael Niedermayer
c84280b09c Merge commit '54f7e79d47' 
* commit '54f7e79d47':
  lavf: add some basic documentation of the muxing process

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 14:09:29 +01:00
Michael Niedermayer
6fd7ea44b2 Merge commit '4c75059950' 
* commit '4c75059950':
  lavf: rewrite the av_write_frame() doxy

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 13:51:56 +01:00
Michael Niedermayer
58fdc6db6c Merge commit 'ad7f2b69a5' 
* commit 'ad7f2b69a5':
  lavf: rewrite the av_interleaved_write_frame() doxy

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 13:37:37 +01:00
Michael Niedermayer
6fb8684a24 Merge commit 'b36bc81cca' 
* commit 'b36bc81cca':
  avplay: add support for seeking to chapter marks

Conflicts:
	doc/ffplay.texi
	ffplay.c

ffplay uses pageup/down for seeking by +-10min
thus this use of the keys conflicts.
The merge thus uses them to seek to chapters when there are some or
+-10min when there are not

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 13:26:31 +01:00
Christophe Gisquet
682b2a809b build: fix examples compilation when EXESUF is not empty 
Due to a wrong substitution doc/examples is not added as a prerequisite
for the objects of the example programs. This results in compiler error
due to the non-existing output directory.

Bug-Id: 636

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2014-02-10 13:23:21 +01:00
Marton Balint
6421111b52 lavf: allow av_find_best_stream to return AV_DISPOSITION_*_IMPAIRED wanted_streams 
Previously these type of streams were not returned even if wanted stream was
set to a stream of such. Now they are only skipped if they are not wanted
streams.

Fixes ffplay -sst <stream number> out.ts where stream number is a *_IMPAIRED stream.

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 12:58:59 +01:00
Michael Niedermayer
919791f99d Merge commit 'f548f9f9e7' 
* commit 'f548f9f9e7':
  hevc: update conformance streams

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 12:58:17 +01:00
Michael Niedermayer
1e5656bf8a Merge commit 'b5f851ed7e' 
* commit 'b5f851ed7e':
  FATE: force FLAC in the lavf ogg test

Conflicts:
	tests/lavf-regression.sh

See: 28caf13ac3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 12:39:55 +01:00
Michael Niedermayer
6732f4350d Merge commit '38893dc028' 
* commit '38893dc028':
  pcmdec: replace a reachable assert with an error check

Conflicts:
	libavformat/pcmdec.c

No assert removed as there was none in FFmpeg in the equivalent function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 12:36:32 +01:00
Michael Niedermayer
ee2c1e6dd3 Merge commit 'cca4742a5e' 
* commit 'cca4742a5e':
  doc/APIchanges: mark the place where 9 was branched

Conflicts:
	doc/APIchanges

Not merged, as "9" was not a FFmpeg release and not branched anywhere from our APIChanges list

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 12:29:05 +01:00
Michael Niedermayer
2e99867a4e Merge commit 'd711d839ca' 
* commit 'd711d839ca':
  doc/APIchanges: fill in missing hashes and dates

Conflicts:
	doc/APIchanges

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 12:17:35 +01:00
Anton Khirnov
18c896be3d lavf: extend / improve the AVFormatContext doxy 2014-02-10 11:46:49 +01:00
Anton Khirnov
54f7e79d47 lavf: add some basic documentation of the muxing process 2014-02-10 11:44:21 +01:00
Anton Khirnov
4c75059950 lavf: rewrite the av_write_frame() doxy 
Remove some vague / incorrect statements and make the text more specific
and less confusing.
 2014-02-10 11:37:30 +01:00
Anton Khirnov
ad7f2b69a5 lavf: rewrite the av_interleaved_write_frame() doxy 
Remove some vague / incorrect statements and make the text more specific
and less confusing.
 2014-02-10 11:34:41 +01:00
Anton Khirnov
b36bc81cca avplay: add support for seeking to chapter marks 2014-02-10 11:23:01 +01:00
Guillaume Martres
f548f9f9e7 hevc: update conformance streams 
New streams: LTRPSPS_A_Qualcomm_1, SLPPLP_A_VIDYO_1, VPSID_A_VIDYO_1
Updated streams: EXT_A_ericsson_4, NUT_A_ericsson_5, RPS_C_ericsson_5,
  RPS_D_ericsson_6

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-02-10 07:48:41 +01:00
Anton Khirnov
b5f851ed7e FATE: force FLAC in the lavf ogg test 
Since b0c2c09, vorbis would be used if libvorbis is compiled in.
 2014-02-10 07:43:40 +01:00
Anton Khirnov
38893dc028 pcmdec: replace a reachable assert with an error check 
Libavformat should not make any assumptions about values returned from
other libraries. This assert is easily reachable by using a non-raw
codec id.
 2014-02-10 07:41:21 +01:00
Anton Khirnov
cca4742a5e doc/APIchanges: mark the place where 9 was branched 2014-02-10 07:29:27 +01:00
Anton Khirnov
d711d839ca doc/APIchanges: fill in missing hashes and dates 2014-02-10 07:29:27 +01:00
Michael Niedermayer
03911c418f Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  hevc: Conceal zero td

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 03:54:54 +01:00
Michael Niedermayer
51290068fa Merge commit 'e95018b694' 
* commit 'e95018b694':
  dnxhd: Support DNx444

Conflicts:
	Changelog
	libavcodec/dnxhddata.c
	libavcodec/dnxhddec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 03:42:06 +01:00
Michael Niedermayer
d84f1a60e0 Merge commit '2f6eec65ac' 
* commit '2f6eec65ac':
  vp8: fix PPC assembly to work if src_stride != dst_stride

See: 34b429d5ba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 02:21:40 +01:00
Michael Niedermayer
ec1a1be54f Merge commit 'b37effdc52' 
* commit 'b37effdc52':
  mxfdec: free descriptor extradata in .read_close()

See: 9f92e590ba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 01:08:51 +01:00
Michael Niedermayer
682e289b97 Merge commit '6a8475dc4f' 
* commit '6a8475dc4f':
  asvenc: free avctx->coded_frame on codec close

Not merged as we do not allocate coded_frame

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-09 22:40:41 +01:00
Michael Niedermayer
b7c6ccc1e6 Merge commit 'd6eac2f1bc' 
* commit 'd6eac2f1bc':
  arm: Remove a stray .fpu directive

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-09 20:57:55 +01:00
Michael Niedermayer
8c596864cd Merge commit '28e508a946' 
* commit '28e508a946':
  dnxhddec: return proper error code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-09 20:52:05 +01:00
Michael Niedermayer
28caf13ac3 fate: fix lavf-ogg test 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-09 20:10:02 +01:00
Michael Niedermayer
cf0e5b7fd4 Merge commit 'b0c2c097e4' 
* commit 'b0c2c097e4':
  lavf: default .ogg audio to libvorbis if we can

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-09 20:04:01 +01:00
Michael Niedermayer
5b23c7ed6f Merge commit 'bc3f03567a' 
* commit 'bc3f03567a':
  g2meet: rename FRAME_INFO to more appropriate DISPLAY_INFO

Conflicts:
	libavcodec/g2meet.c

See: cb2162adba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-09 20:02:07 +01:00
Luca Barbato
246d3bf0ec hevc: Conceal zero td 
It was done only in check_mvset(), while mv_scale() is called also by
dist_scale().

Sample-Id: 00001579-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2014-02-09 19:53:43 +01:00
Kostya Shishkov
e95018b694 dnxhd: Support DNx444 
Bug-Id: 99
Bug-Id: videolan/9620
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-02-09 19:53:35 +01:00
Michael Niedermayer
ffe987b96d Merge commit '722554788b' 
* commit '722554788b':
  Add raw HEVC muxer

Conflicts:
	libavformat/version.h

See: ef5d32b9c5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-09 19:43:18 +01:00