]> git.sesse.net Git - ffmpeg/commit
projects / ffmpeg / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3f5d1c8 a505c0d)
Merge commit 'a505c0d7373336a4cc5aa2022111c46bdd388b1f'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 01:33:15 +0000 (02:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 01:34:17 +0000 (02:34 +0100)
commit5162af67f41214edacefe05d9723e4a6d9847900
treee07706bd952bc563e0b56adc26199675e19238d1tree | snapshot
parent3f5d1c8130b1326d779c4216886272a3efce816acommit | diff
parenta505c0d7373336a4cc5aa2022111c46bdd388b1fcommit | diff
Merge commit 'a505c0d7373336a4cc5aa2022111c46bdd388b1f'

* commit 'a505c0d7373336a4cc5aa2022111c46bdd388b1f':
  rtp: Initial H.261 support

Conflicts:
Changelog
libavformat/rtpdec_h261.c
libavformat/rtpenc_h261.c
libavformat/sdp.c
libavformat/version.h

See: 50a4d5cfc6749932347ee38c25b5040aea4b13a0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog diff1 | diff2 | blob | history
libavformat/rtpdec_formats.h diff1 | diff2 | blob | history
libavformat/rtpdec_h261.c diff1 | diff2 | blob | history
libavformat/rtpenc.c diff1 | diff2 | blob | history
libavformat/rtpenc_h261.c diff1 | diff2 | blob | history
libavformat/sdp.c diff1 | diff2 | blob | history
libavformat/version.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.