-
- Downloads
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc: Replace some @file tags by more suitable markup.
fate: Set FUZZ factor of vorbis-13 test to 2.
fate: Set FUZZ factor of (e)ac3-encode test to 3.
fate: remove unused code from regressions-funcs.sh
rtmp: Don't assume path points to a string of nonzero length
avconv: fix behavior with -ss as an output option.
Conflicts:
doc/platform.texi
doc/protocols.texi
ffmpeg.c
Merged-by:
Michael Niedermayer <michaelni@gmx.at>
No related branches found
No related tags found
Showing
- doc/general.texi 2 additions, 1 deletiondoc/general.texi
- doc/platform.texi 4 additions, 4 deletionsdoc/platform.texi
- ffmpeg.c 4 additions, 2 deletionsffmpeg.c
- libavformat/rtmpproto.c 3 additions, 2 deletionslibavformat/rtmpproto.c
- tests/fate/ac3.mak 2 additions, 0 deletionstests/fate/ac3.mak
- tests/fate/vorbis.mak 1 addition, 0 deletionstests/fate/vorbis.mak
Loading
Please register or sign in to comment