mirror of https://git.ffmpeg.org/ffmpeg.git
* qatar/master: (27 commits) avconv: free packet in write_frame() when discarding due to frame number limit FATE: use +/- flag option syntax for vp8 emu-edge tests lavf: make av_interleave_packet_per_dts() private. lavf: deprecate av_read_packet(). oggdec: output correct timestamps for Vorbis avconv: pass input stream timestamps to audio encoders lavc: shrink encoded audio packet size after encoding. xa: set correct bit rate xa: do not set bit_rate, block_align, or bits_per_coded_sample xa: fix end-of-file handling xa: fix timestamp calculation bink: fix typo in FFALIGN() argument bink: align plane width to 8 when calculating bundle sizes doc: pass -Idoc texi2html and texi2pod doc: texi2pod: add -I flag movenc: Add a min_frag_duration option rtsp: Set the default delay to 0.1 s for the RTSP/SDP/RTP demuxers libavformat: Set the default for the max_delay option to -1 Generate manpages for AV{Format,Codec}Context AVOptions. doc/avconv: remove entries for AVOptions. ... Conflicts: doc/Makefile doc/ffmpeg.texi doc/muxers.texi ffmpeg.c libavcodec/Makefile libavcodec/options.c libavcodec/vp8.c libavformat/options.c tests/fate/demux.mak tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
---|---|---|
.. | ||
aac.mak | ||
ac3.mak | ||
adpcm.mak | ||
als.mak | ||
amrnb.mak | ||
amrwb.mak | ||
atrac.mak | ||
audio.mak | ||
cdxl.mak | ||
dct.mak | ||
demux.mak | ||
dfa.mak | ||
dpcm.mak | ||
ea.mak | ||
fft.mak | ||
h264.mak | ||
image.mak | ||
indeo.mak | ||
libavcodec.mak | ||
libavutil.mak | ||
lossless-audio.mak | ||
lossless-video.mak | ||
mapchan.mak | ||
microsoft.mak | ||
mp3.mak | ||
mpc.mak | ||
pcm.mak | ||
prores.mak | ||
qt.mak | ||
qtrle.mak | ||
real.mak | ||
screen.mak | ||
utvideo.mak | ||
video.mak | ||
voice.mak | ||
vorbis.mak | ||
vpx.mak | ||
vqf.mak | ||
wavpack.mak | ||
wma.mak |