virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  Avoid C99 variable declarations within for statements.
  rtmp: Read and handle incoming packets while writing data
  doc: document THREAD_TYPE fate variable
  rtpdec: Don't require frames to start with a Mode A packet
  avconv: don't try to free threads that were not initialized.

Conflicts:
	doc/fate.texi
	ffplay.c
	libavdevice/dv1394.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-06-15 00:14:21 +02:00
parent 01a14ce042 d246c18ea6
commit 15f8941108
9 changed files with 66 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavdevice/dv1394.h
+1 -1
View File
@@ -176,7 +176,7 @@
reset_dv1394();
} else {
int i;
for(i = 0; i < status.n_clear_frames; i++) {
for (i = 0; i < status.n_clear_frames; i++) {
copy_DV_frame();
}
}