diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-04 13:23:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-04 13:23:19 +0100 |
| commit | 8d0b2aae71f01904e4a7ac0e8795592da5a0bd89 (patch) | |
| tree | e0bfc884210a851e22fd1acabb6b9e873cef5bb4 /libavcodec/vqavideo.c | |
| parent | ea96feddb7bb813c1e0c9befe9c96bf73996f841 (diff) | |
| parent | e96406eda4f143f101bd44372f7b2d542183000a (diff) | |
| download | ffmpeg-8d0b2aae71f01904e4a7ac0e8795592da5a0bd89.tar.gz | |
Merge commit 'e96406eda4f143f101bd44372f7b2d542183000a'
* commit 'e96406eda4f143f101bd44372f7b2d542183000a':
rtsp: Add support for depacketizing RTP data via custom IO
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vqavideo.c')
0 files changed, 0 insertions, 0 deletions