Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(876)

Unified Diff: media/bench/bench.cc

Issue 113748: New FFmpeg public API headers to match our source tarball in deps. (Closed)
Patch Set: Fixes Created 11 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/media_posix.cc ('k') | media/filters/ffmpeg_audio_decoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/bench/bench.cc
diff --git a/media/bench/bench.cc b/media/bench/bench.cc
index 42deacf20aa152129acaa632e2ee446f346e07b9..147b91aebbd285436f3763ce6463afb869683dbb 100644
--- a/media/bench/bench.cc
+++ b/media/bench/bench.cc
@@ -189,12 +189,12 @@ int main(int argc, const char** argv) {
base::TimeTicks decode_start = base::TimeTicks::HighResNow();
if (target_codec == CODEC_TYPE_AUDIO) {
int size_out = AVCODEC_MAX_AUDIO_FRAME_SIZE;
- result = avcodec_decode_audio2(codec_context, samples, &size_out,
- packet.data, packet.size);
+ result = avcodec_decode_audio3(codec_context, samples, &size_out,
+ &packet);
} else if (target_codec == CODEC_TYPE_VIDEO) {
int got_picture = 0;
- result = avcodec_decode_video(codec_context, frame, &got_picture,
- packet.data, packet.size);
+ result = avcodec_decode_video2(codec_context, frame, &got_picture,
+ &packet);
} else {
NOTREACHED();
}
« no previous file with comments | « media/base/media_posix.cc ('k') | media/filters/ffmpeg_audio_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698