-
- Downloads
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Automatically add more flags required on symbian
mem.h: switch doxygen parameter order to match function prototype
doxygen: replace @sa tag by the more readable but equivalent @see
doxygen: use Doxygen markup for authors and web links where appropriate
doxygen: do not include license boilerplate in Doxygen documentation
ac3enc: Mark AVClasses const
ffserver: Replace two loops with one loop.
ffmpeg: Fix the check for experimental codecs
swscale: extend mmx padding.
swscale: clip unscaled colorspace conversion path.
doxygen: misc consistency cosmetics
doc: remove file name from @file directive in Doxygen usage example
doxygen: consistently place brief description
doxygen: place empty line between brief description and detailed description
avformat_open_input(): Add braces to shut up gcc warning.
Conflicts:
libavcodec/8svx.c
libavcodec/tiff.c
libavcodec/tiff.h
libavcodec/vaapi_h264.c
libavcodec/vorbis.c
libavcodec/vorbisdec.c
libavcodec/vp6.c
libswscale/swscale_unscaled.c
libswscale/utils.c
Merged-by:
Michael Niedermayer <michaelni@gmx.at>
No related branches found
No related tags found
Showing
- configure 8 additions, 1 deletionconfigure
- doc/developer.texi 1 addition, 1 deletiondoc/developer.texi
- ffmpeg.c 1 addition, 1 deletionffmpeg.c
- ffserver.c 4 additions, 12 deletionsffserver.c
- libavcodec/8svx.c 2 additions, 0 deletionslibavcodec/8svx.c
- libavcodec/ac3enc_fixed.c 2 additions, 2 deletionslibavcodec/ac3enc_fixed.c
- libavcodec/ac3enc_float.c 2 additions, 2 deletionslibavcodec/ac3enc_float.c
- libavcodec/alac.c 1 addition, 3 deletionslibavcodec/alac.c
- libavcodec/bethsoftvideo.c 2 additions, 2 deletionslibavcodec/bethsoftvideo.c
- libavcodec/bfi.c 1 addition, 1 deletionlibavcodec/bfi.c
- libavcodec/cdgraphics.c 2 additions, 2 deletionslibavcodec/cdgraphics.c
- libavcodec/eac3enc.c 2 additions, 2 deletionslibavcodec/eac3enc.c
- libavcodec/eatqi.c 2 additions, 4 deletionslibavcodec/eatqi.c
- libavcodec/faxcompr.c 1 addition, 1 deletionlibavcodec/faxcompr.c
- libavcodec/faxcompr.h 1 addition, 1 deletionlibavcodec/faxcompr.h
- libavcodec/flacdec.c 1 addition, 3 deletionslibavcodec/flacdec.c
- libavcodec/g722.c 0 additions, 1 deletionlibavcodec/g722.c
- libavcodec/huffman.c 6 additions, 3 deletionslibavcodec/huffman.c
- libavcodec/huffman.h 6 additions, 3 deletionslibavcodec/huffman.h
- libavcodec/lzw.c 1 addition, 1 deletionlibavcodec/lzw.c
Loading
Please register or sign in to comment