-
- Downloads
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpeg4dec: use unsigned type for startcode in ff_mpeg4_decode_picture_header
mpeg124: use sign_extend() function
ac3dec: use get_sbits() instead of manually sign-extending
4xm: fix signed overflow
wmavoice: fix a signed overflow
mpegvideo_enc: fix a signed overflow
crc: fix signed overflow
fate: run avconv with -nostats flag
avtools: add -v as alias for -loglevel
avconv: always print stats with AV_LOG_INFO
doc/avconv: add forgotten output/per-stream info to -filter
avconv: add -stats option to enable/disable printing encoding progress
avconv: in output_packet() don't set decoded_data_size for video.
avconv: remove pointless always true condition
avconv: factorize common code in transcode_init()
zmbv: remove memcpy() of decoded frame
mpeg12enc: use sign_extend() function
h264pred: use unsigned types for pixel values, fix signed overflows
h264: fix signed overflows in x*0x01010101 expressions
h264pred: remove unused variables
Conflicts:
avconv.c
tests/fate-run.sh
Merged-by:
Michael Niedermayer <michaelni@gmx.at>
No related branches found
No related tags found
Showing
- avconv.c 10 additions, 16 deletionsavconv.c
- cmdutils.c 2 additions, 0 deletionscmdutils.c
- cmdutils_common_opts.h 1 addition, 0 deletionscmdutils_common_opts.h
- doc/avconv.texi 4 additions, 5 deletionsdoc/avconv.texi
- doc/avtools-common-opts.texi 1 addition, 1 deletiondoc/avtools-common-opts.texi
- ffmpeg.c 10 additions, 16 deletionsffmpeg.c
- libavcodec/4xm.c 1 addition, 1 deletionlibavcodec/4xm.c
- libavcodec/ac3dec.c 2 additions, 2 deletionslibavcodec/ac3dec.c
- libavcodec/h264.c 1 addition, 1 deletionlibavcodec/h264.c
- libavcodec/h264_mvpred.h 1 addition, 1 deletionlibavcodec/h264_mvpred.h
- libavcodec/h264pred.c 5 additions, 7 deletionslibavcodec/h264pred.c
- libavcodec/h264pred_template.c 16 additions, 16 deletionslibavcodec/h264pred_template.c
- libavcodec/ituh263dec.c 2 additions, 3 deletionslibavcodec/ituh263dec.c
- libavcodec/ituh263enc.c 2 additions, 3 deletionslibavcodec/ituh263enc.c
- libavcodec/mpeg12.c 2 additions, 4 deletionslibavcodec/mpeg12.c
- libavcodec/mpeg12enc.c 2 additions, 2 deletionslibavcodec/mpeg12enc.c
- libavcodec/mpeg4videodec.c 1 addition, 1 deletionlibavcodec/mpeg4videodec.c
- libavcodec/mpegvideo_enc.c 1 addition, 1 deletionlibavcodec/mpegvideo_enc.c
- libavcodec/wmavoice.c 1 addition, 1 deletionlibavcodec/wmavoice.c
- libavcodec/zmbv.c 1 addition, 1 deletionlibavcodec/zmbv.c
Loading
Please register or sign in to comment