apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2026-04-24 08:36:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2012-10-24 13:31:46 +02:00
parent 42ee9f3981 0c03cc6838
commit f3b8096bc0
7 changed files with 132 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavformat/os_support.h
+1 -1
View File
@@ -67,7 +67,7 @@ static inline int is_dos_path(const char *path)
return 0;
}
#if defined(__OS2__)
#if defined(__OS2__) || defined(__Plan9__)
#define SHUT_RD 0
#define SHUT_WR 1
#define SHUT_RDWR 2