diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 02:33:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 02:34:17 +0100 |
| commit | 5162af67f41214edacefe05d9723e4a6d9847900 (patch) | |
| tree | e07706bd952bc563e0b56adc26199675e19238d1 /tools/fourcc2pixfmt.c | |
| parent | 3f5d1c8130b1326d779c4216886272a3efce816a (diff) | |
| parent | a505c0d7373336a4cc5aa2022111c46bdd388b1f (diff) | |
| download | ffmpeg-streaming-5162af67f41214edacefe05d9723e4a6d9847900.zip ffmpeg-streaming-5162af67f41214edacefe05d9723e4a6d9847900.tar.gz | |
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>
Diffstat (limited to 'tools/fourcc2pixfmt.c')
0 files changed, 0 insertions, 0 deletions
