-
- Downloads
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avcodec: av_log_missing_feature(1) ---> avpriv_request_sample()
Conflicts:
libavcodec/aacsbr.c
libavcodec/amrnbdec.c
libavcodec/takdec.c
libavcodec/tta.c
Merged-by:
Michael Niedermayer <michaelni@gmx.at>
Showing
- libavcodec/aacdec.c 6 additions, 8 deletionslibavcodec/aacdec.c
- libavcodec/aacsbr.c 1 addition, 1 deletionlibavcodec/aacsbr.c
- libavcodec/ac3dec.c 1 addition, 1 deletionlibavcodec/ac3dec.c
- libavcodec/amrnbdec.c 1 addition, 1 deletionlibavcodec/amrnbdec.c
- libavcodec/amrwbdec.c 1 addition, 1 deletionlibavcodec/amrwbdec.c
- libavcodec/eac3dec.c 4 additions, 4 deletionslibavcodec/eac3dec.c
- libavcodec/flashsv.c 3 additions, 3 deletionslibavcodec/flashsv.c
- libavcodec/h264.c 2 additions, 2 deletionslibavcodec/h264.c
- libavcodec/mimic.c 1 addition, 1 deletionlibavcodec/mimic.c
- libavcodec/mpc8.c 1 addition, 1 deletionlibavcodec/mpc8.c
- libavcodec/rv10.c 1 addition, 1 deletionlibavcodec/rv10.c
- libavcodec/smc.c 1 addition, 1 deletionlibavcodec/smc.c
- libavcodec/truemotion2.c 1 addition, 1 deletionlibavcodec/truemotion2.c
- libavcodec/vp8.c 1 addition, 1 deletionlibavcodec/vp8.c
- libavcodec/wmalosslessdec.c 2 additions, 2 deletionslibavcodec/wmalosslessdec.c
- libavcodec/wmaprodec.c 1 addition, 1 deletionlibavcodec/wmaprodec.c
- libavcodec/wmavoice.c 1 addition, 1 deletionlibavcodec/wmavoice.c
Loading
Please register or sign in to comment