Merge commit '26a44143ef'
* commit '26a44143ef':
avplay: remove a warning
Conflicts:
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
5fd254c4f6
1 changed files with 1 additions and 1 deletions
2
ffplay.c
2
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) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue