-
- Downloads
Merge remote-tracking branch 'qatar/master'
* qatar/master:
movenc: Write chan atom for all audio tracks in mov mode movies.
mpegtsenc: use avio_open_dyn_buf(), zero pointers after freeing
doc/avconv: add some details about the transcoding process.
avidec: make scale and rate unsigned.
avconv: check output stream recording time before each frame returned from filters
avconv: split selecting input file out of transcode().
avconv: split checking for active outputs out of transcode().
avfiltergraph: make some functions static.
Conflicts:
ffmpeg.c
libavfilter/avfiltergraph.c
libavfilter/internal.h
libavformat/mpegtsenc.c
tests/ref/fate/acodec-alac
tests/ref/fate/acodec-pcm-s16be
tests/ref/fate/acodec-pcm-s24be
tests/ref/fate/acodec-pcm-s32be
tests/ref/fate/acodec-pcm-s8
tests/ref/lavf/mov
Merged-by:
Michael Niedermayer <michaelni@gmx.at>
No related branches found
No related tags found
Showing
- doc/ffmpeg.texi 120 additions, 0 deletionsdoc/ffmpeg.texi
- ffmpeg.c 59 additions, 38 deletionsffmpeg.c
- libavfilter/avfiltergraph.c 22 additions, 6 deletionslibavfilter/avfiltergraph.c
- libavfilter/internal.h 0 additions, 22 deletionslibavfilter/internal.h
- libavformat/avidec.c 2 additions, 2 deletionslibavformat/avidec.c
- libavformat/movenc.c 3 additions, 1 deletionlibavformat/movenc.c
- libavformat/mpegtsenc.c 7 additions, 46 deletionslibavformat/mpegtsenc.c
- tests/ref/fate/acodec-alac 2 additions, 2 deletionstests/ref/fate/acodec-alac
- tests/ref/fate/acodec-pcm-s16be 2 additions, 2 deletionstests/ref/fate/acodec-pcm-s16be
- tests/ref/fate/acodec-pcm-s24be 2 additions, 2 deletionstests/ref/fate/acodec-pcm-s24be
- tests/ref/fate/acodec-pcm-s32be 2 additions, 2 deletionstests/ref/fate/acodec-pcm-s32be
- tests/ref/fate/acodec-pcm-s8 2 additions, 2 deletionstests/ref/fate/acodec-pcm-s8
- tests/ref/lavf/mov 8 additions, 8 deletionstests/ref/lavf/mov
Loading
Please register or sign in to comment