Merge commit '26a44143efb513a602542fb59aee87b1fc62af51'

* commit '26a44143efb513a602542fb59aee87b1fc62af51': avplay: remove a warning Conflicts: ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago · 5fd254c4f6
parent 54056c1493 26a44143ef
commit 5fd254c4f6
1 changed files with 1 additions and 1 deletions
--- a/ffplay.c
+++ b/ffplay.c
@ -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) {