* commit '54f7e79d4706a8343dad1d8da51b7d3d3b2cd3b2':
lavf: add some basic documentation of the muxing process
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'b36bc81ccaa2fc85dc4bae7dc546c71e8833573d':
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>
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>
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>
* commit 'b5f851ed7e59f88b4130a420033d9fe191ec9e2f':
FATE: force FLAC in the lavf ogg test
Conflicts:
tests/lavf-regression.sh
See: 28caf13ac3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '38893dc028e458eaf3f906833d4ee515689edb7e':
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>
* commit 'cca4742a5e663cfe4dbd71f01f0c0fb042fddc1d':
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>
* commit 'd711d839ca6714a5ef5b53ee51bc7632e62cf203':
doc/APIchanges: fill in missing hashes and dates
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '2f6eec65acc953faed3951fb8f1eabed830fdd2f':
vp8: fix PPC assembly to work if src_stride != dst_stride
See: 34b429d5ba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '6a8475dc4f10d65edb7faa8df6e035af0ddcce19':
asvenc: free avctx->coded_frame on codec close
Not merged as we do not allocate coded_frame
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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
Since 2007, the Xiph.org Foundation recommends that .ogg only be used
for Ogg Vorbis audio files.
Source: http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
However we only do it if we have libvorbis available because the
built in vorbis encoder is not as good.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
