-
- Downloads
Merge commit '9a07c133'
* commit '9a07c133': parser: Move Doxygen documentation to the header files PGS subtitles: Expose forced flag x86: PMINUB: port to cpuflags Conflicts: libavcodec/avcodec.h libavcodec/pgssubdec.c libavcodec/version.h libavcodec/x86/ac3dsp.asm Merged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
- libavcodec/avcodec.h 7 additions, 5 deletionslibavcodec/avcodec.h
- libavcodec/dvdsubdec.c 1 addition, 1 deletionlibavcodec/dvdsubdec.c
- libavcodec/options.c 2 additions, 1 deletionlibavcodec/options.c
- libavcodec/parser.c 0 additions, 9 deletionslibavcodec/parser.c
- libavcodec/parser.h 5 additions, 0 deletionslibavcodec/parser.h
- libavcodec/pgssubdec.c 1 addition, 1 deletionlibavcodec/pgssubdec.c
- libavcodec/version.h 1 addition, 1 deletionlibavcodec/version.h
- libavcodec/x86/ac3dsp.asm 0 additions, 3 deletionslibavcodec/x86/ac3dsp.asm
- libavutil/x86/x86util.asm 5 additions, 5 deletionslibavutil/x86/x86util.asm
Loading
Please register or sign in to comment