diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-22 23:54:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-22 23:54:34 +0100 |
| commit | db4a2976f6afb6ac16bdd455695dcc277a03416d (patch) | |
| tree | 4beb864664ddb62d9a6b56dbb6ea9609f2772222 /version.sh | |
| parent | 0a32a1b4bbcdffe5c6a61a9e8ea64a17bf31f172 (diff) | |
| parent | c99915f7c74ce1249d8633cb6fd09035b8d84db7 (diff) | |
| download | ffmpeg-db4a2976f6afb6ac16bdd455695dcc277a03416d.tar.gz | |
Merge commit 'c99915f7c74ce1249d8633cb6fd09035b8d84db7'
* commit 'c99915f7c74ce1249d8633cb6fd09035b8d84db7':
rtpdec: DV depacketizer (RFC 6469)
Conflicts:
Changelog
libavformat/Makefile
libavformat/rtpdec_dv.c
libavformat/version.h
See: cbe508553ad17b277d4cb6f12f61aac4f52908b8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'version.sh')
0 files changed, 0 insertions, 0 deletions