Merge commit '26a44143efb513a602542fb59aee87b1fc62af51' · 5fd254c4f6 - Zikk

Merge commit '26a44143efb513a602542fb59aee87b1fc62af51'

* commit '26a44143efb513a602542fb59aee87b1fc62af51':
  avplay: remove a warning

Conflicts:
	ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Michael Niedermayer 12 years ago

parent

54056c1493 26a44143ef

commit

5fd254c4f6

1 changed files with 1 additions and 1 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 1
						
ffplay.c
							 
								View File
							
				@@ -3535,7 +3535,7 @@ int main(int argc, char **argv)
			
				     }
			
				     av_init_packet(&flush_pkt);
			
				-    flush_pkt.data = (char *)(intptr_t)"FLUSH";
			
				+    flush_pkt.data = (uint8_t *)&flush_pkt;
			
				     is = stream_open(input_filename, file_iformat);
			
				     if (!is) {