diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 21:50:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 21:55:46 +0100 |
| commit | 8c1c06937156fb8dba1f1266b985f8671c29f4e2 (patch) | |
| tree | 9df1100e69b52f6e0567c52e9cd64db9fd692cdb /ffmpeg_vdpau.c | |
| parent | c6792275f43cdf1fc42f1cf4bd37c4595b048180 (diff) | |
| parent | 04a1be8e28e81f3967eace7705343c450616cc95 (diff) | |
| download | ffmpeg-8c1c06937156fb8dba1f1266b985f8671c29f4e2.tar.gz | |
Merge commit '04a1be8e28e81f3967eace7705343c450616cc95'
* commit '04a1be8e28e81f3967eace7705343c450616cc95':
libavformat: add T.140 RTP depacketization (RFC 4103)
Conflicts:
libavformat/rtpdec.c
libavformat/version.h
See: af940e6cb1212d4338e55c03498ef5ae40e6e749
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_vdpau.c')
0 files changed, 0 insertions, 0 deletions