mirror of https://git.ffmpeg.org/ffmpeg.git
574dcb5baf
* qatar/master: lavf: don't guess r_frame_rate from either stream or codec timebase. avconv: set discard on input streams automatically. Fix parser not to clobber has_b_frames when extradata is set. lavf: don't set codec timebase in avformat_find_stream_info(). avconv: saner output video timebase. rawdec: set timebase to 1/fps. avconv: refactor vsync code. FATE: remove a bunch of useless -vsync 0 cdxl: bit line plane arrangement support cdxl: remove early check for bpp cdxl: set pix_fmt PAL8 only if palette is available Conflicts: ffmpeg.c libavcodec/h264_parser.c libavformat/rawdec.c tests/fate/demux.mak tests/fate/ea.mak tests/fate/h264.mak tests/fate/prores.mak tests/fate/video.mak tests/ref/fate/bethsoft-vid tests/ref/fate/creatureshock-avs tests/ref/fate/ea-cmv tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/nuv tests/ref/fate/prores-alpha tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/real-rv40 tests/ref/fate/rpza tests/ref/fate/wmv8-drm Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
|---|---|---|
| .. | ||
| doxy | ||
| examples | ||
| APIchanges | ||
| Makefile | ||
| RELEASE_NOTES | ||
| 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 | ||
| metadata.texi | ||
| multithreading.txt | ||
| muxers.texi | ||
| optimization.txt | ||
| outdevs.texi | ||
| platform.texi | ||
| protocols.texi | ||
| rate_distortion.txt | ||
| snow.txt | ||
| soc.txt | ||
| swresample.txt | ||
| swscale.txt | ||
| t2h.init | ||
| tablegen.txt | ||
| texi2pod.pl | ||
| viterbi.txt | ||