diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-05 13:27:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-05 13:27:59 +0100 |
| commit | 2163c8828d21d9c774ba69c8264c865921a47f2b (patch) | |
| tree | 6f72f9b04c31fb322a49baf4fb783025c9ef2792 /libswscale | |
| parent | be0a67bd6508ccff81570a41ebe8169e34012c66 (diff) | |
| parent | b14e89b3c5e6d7f6401a2ff1e3d198fa902e988a (diff) | |
Merge commit 'b14e89b3c5e6d7f6401a2ff1e3d198fa902e988a'
* commit 'b14e89b3c5e6d7f6401a2ff1e3d198fa902e988a':
Prepare for 9 Release.
Update release notes for the 9 release.
avprobe: also output dar/par if only defined in stream
Conflicts:
RELEASE
avprobe.c
doc/RELEASE_NOTES
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
0 files changed, 0 insertions, 0 deletions