-
- Downloads
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avprobe, cmdutils: K&R formatting cosmetics
tests: K&R formatting cosmetics for test programs
lavf: free packets for muxers implementing interleave_packet().
lavf: fix and extend av_interleaved_write_frame() doxy.
mov: Remove dead stores for spherical coordinates for channel position.
error_resilience: K&R formatting cosmetics
RELEASE_NOTES: mention hiding private symbols in shared builds.
RELEASE_NOTES: mention some notable API changes in 0.8
Conflicts:
cmdutils.h
doc/RELEASE_NOTES
ffprobe.c
libavcodec/error_resilience.c
Merged-by:
Michael Niedermayer <michaelni@gmx.at>
Showing
- cmdutils.h 12 additions, 6 deletionscmdutils.h
- doc/RELEASE_NOTES 32 additions, 2 deletionsdoc/RELEASE_NOTES
- ffprobe.c 12 additions, 9 deletionsffprobe.c
- libavcodec/error_resilience.c 713 additions, 595 deletionslibavcodec/error_resilience.c
- libavformat/avformat.h 12 additions, 3 deletionslibavformat/avformat.h
- libavformat/mov.c 3 additions, 4 deletionslibavformat/mov.c
- libavformat/utils.c 6 additions, 3 deletionslibavformat/utils.c
- tests/audiogen.c 36 additions, 36 deletionstests/audiogen.c
- tests/base64.c 5 additions, 4 deletionstests/base64.c
- tests/rotozoom.c 58 additions, 55 deletionstests/rotozoom.c
- tests/tiny_psnr.c 90 additions, 87 deletionstests/tiny_psnr.c
- tests/videogen.c 75 additions, 69 deletionstests/videogen.c
Loading
Please register or sign in to comment