OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fddd6af
728ea23
)
Merge commit '728ea23cce07467b732f538c87c13da13dd6dcf3'
author
James Almer
<jamrial@gmail.com>
Tue, 4 Apr 2017 17:41:23 +0000
(14:41 -0300)
committer
James Almer
<jamrial@gmail.com>
Tue, 4 Apr 2017 17:41:23 +0000
(14:41 -0300)
* commit '
728ea23cce07467b732f538c87c13da13dd6dcf3
':
examples/decode_video: switch to the new decoding API
Merged-by: James Almer <jamrial@gmail.com>
1
2
doc/examples/decode_video.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
doc/examples/decode_video.c
index
980add3
,
7414643
..
5c1c42c
---
1
/
doc/examples/decode_video.c
---
2
/
doc/examples/decode_video.c
+++ b/
doc/examples/decode_video.c
@@@
-165,14
-161,12
+168,12
@@@
int main(int argc, char **argv
data_size -= ret;
if (avpkt.size)
- decode(c,
pictur
e, &avpkt, outfilename);
- }
- }
+ decode(c,
fram
e, &avpkt, outfilename);
+
}
+
}
/* flush the decoder */
- avpkt.data = NULL;
- avpkt.size = 0;
- decode(c, frame, &avpkt, outfilename);
- decode(c, picture, NULL, outfilename);
++ decode(c, frame, NULL, outfilename);
fclose(f);