RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '26a44143efb513a602542fb59aee87b1fc62af51' 

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

Conflicts:
	ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-04-28 12:03:41 +02:00
parent 54056c1493 26a44143ef
commit 5fd254c4f6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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) {