diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-29 01:09:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-29 01:13:59 +0200 |
| commit | a8499cbbe87d00456c391f41207e1981bd7f746a (patch) | |
| tree | fdfc491b412384196ec02fcf305db586a92d2c83 /libavresample | |
| parent | d858ee717bed6307b8e772bd5039ab001aeae03f (diff) | |
| parent | c94e2e85cb6af8a570d8542a830556243bd32873 (diff) | |
| download | android_external_ffmpeg-a8499cbbe87d00456c391f41207e1981bd7f746a.tar.gz android_external_ffmpeg-a8499cbbe87d00456c391f41207e1981bd7f746a.tar.bz2 android_external_ffmpeg-a8499cbbe87d00456c391f41207e1981bd7f746a.zip | |
Merge commit 'c94e2e85cb6af8a570d8542a830556243bd32873'
* commit 'c94e2e85cb6af8a570d8542a830556243bd32873':
nut: Support experimental NUT 4 features
Conflicts:
doc/nut.texi
libavformat/nut.h
libavformat/nutdec.c
libavformat/nutenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
0 files changed, 0 insertions, 0 deletions