OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4f043c8 9294f53)
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Apr 2012 18:55:02 +0000 (20:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Apr 2012 18:55:11 +0000 (20:55 +0200)
commit5d6a40bc747da93bd4ee41a446c35fc60a399671
tree613c91012a37b3646f1575955d6124ffc4fdefe7tree | snapshot
parent4f043c8a119101ffe8f6a57b18a47f602a350c30commit | diff
parent9294f538e924dcb8f3938e4e3476340f1e5b552fcommit | diff
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtsp: Don't use av_malloc(0) if there are no streams
  rtsp: Don't use uninitialized data if there are no streams
  vaapi: mpeg2: fix slice_vertical_position calculation.
  hwaccel: mpeg2: decode first field, if requested.
  cosmetics: Fix indentation
  rtsp: Don't expose the MS-RTSP RTX data stream to the caller

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpeg12.c diff1 | diff2 | blob | history
libavcodec/vaapi_mpeg2.c diff1 | diff2 | blob | history
libavformat/rtpdec.c diff1 | diff2 | blob | history
libavformat/rtpdec_amr.c diff1 | diff2 | blob | history
libavformat/rtpdec_asf.c diff1 | diff2 | blob | history
libavformat/rtpdec_h264.c diff1 | diff2 | blob | history
libavformat/rtpdec_latm.c diff1 | diff2 | blob | history
libavformat/rtpdec_mpeg4.c diff1 | diff2 | blob | history
libavformat/rtpdec_xiph.c diff1 | diff2 | blob | history
libavformat/rtsp.c diff1 | diff2 | blob | history
libavformat/rtspdec.c diff1 | diff2 | blob | history
external/ffmpeg
About OSDN
Find Software
Develop Software
Help