mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
0ebd83617f
* 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>
|
||
|---|---|---|
| .. | ||
| doxy | ||
| examples | ||
| APIchanges | ||
| avtools-common-opts.texi | ||
| avutil.txt | ||
| bitstream_filters.texi | ||
| build_system.txt | ||
| decoders.texi | ||
| demuxers.texi | ||
| developer.texi | ||
| encoders.texi | ||
| errno.txt | ||
| eval.texi | ||
| faq.texi | ||
| fate.texi | ||
| ffmpeg-mt-authorship.txt | ||
| ffmpeg.texi | ||
| ffmpeg.txt | ||
| ffplay.texi | ||
| ffprobe.texi | ||
| ffprobe.xsd | ||
| ffserver.conf | ||
| ffserver.texi | ||
| filters.texi | ||
| general.texi | ||
| git-howto.texi | ||
| git-howto.txt | ||
| indevs.texi | ||
| issue_tracker.txt | ||
| libavfilter.texi | ||
| Makefile | ||
| metadata.texi | ||
| multithreading.txt | ||
| muxers.texi | ||
| optimization.txt | ||
| outdevs.texi | ||
| platform.texi | ||
| print_options.c | ||
| protocols.texi | ||
| rate_distortion.txt | ||
| RELEASE_NOTES | ||
| snow.txt | ||
| soc.txt | ||
| swresample.txt | ||
| swscale.txt | ||
| t2h.init | ||
| tablegen.txt | ||
| texi2pod.pl | ||
| viterbi.txt | ||