diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-29 12:53:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-29 13:01:20 +0200 |
| commit | 5fb652dddb79feabec91002ed6f5accb6ccb633d (patch) | |
| tree | a7e6e54036186bdc4575cf61265bc91cbfeaa413 /libavcodec/snow.h | |
| parent | 9d8fb23747239f6e747000254c91f0510e4eb1e1 (diff) | |
| parent | 2219e27b5b17d146e4ab71a3ed86dfc013fb7a93 (diff) | |
| download | ffmpeg-5fb652dddb79feabec91002ed6f5accb6ccb633d.tar.gz | |
Merge commit '2219e27b5b17d146e4ab71a3ed86dfc013fb7a93'
* commit '2219e27b5b17d146e4ab71a3ed86dfc013fb7a93':
oma: correctly mark and decrypt partial packets
Conflicts:
libavformat/omadec.c
See: dcd013a535bccbb163b740b72bbedde67dc8e633
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/snow.h')
0 files changed, 0 insertions, 0 deletions