diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-24 13:31:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-24 13:42:58 +0200 |
| commit | f3b8096bc0e7df9e45db1023d6e6e7bff177d0c4 (patch) | |
| tree | 9b3c775ca329b0453593297d2bd7915ac88bb61e /libavfilter/avfilter.h | |
| parent | 42ee9f3981979880209a60d1ac30057fcfab6e53 (diff) | |
| parent | 0c03cc68386443f1e96ab6fb358220faf67cd5ff (diff) | |
| download | ffmpeg-f3b8096bc0e7df9e45db1023d6e6e7bff177d0c4.tar.gz | |
Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'
* commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff':
mp3: exit on parsing error in mp_decode_frame
rtmppkt: Avoid unescaped backslash in Doxygen comment
fate-lavfi: replace sed/grep/cut combos with awk
build: Plan 9 support
Conflicts:
configure
tests/lavfi-regression.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avfilter.h')
0 files changed, 0 insertions, 0 deletions