diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-22 19:26:27 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-22 19:26:27 +0000 |
| commit | 11309735fce8bf91f70643e955c6153b79f40095 (patch) | |
| tree | 6a87158dbb3995246322c135de4112336ff38e45 /media/bench | |
| parent | bfd71998f58c08dafbdb58ebf59e56b1c7845fc3 (diff) | |
| download | chromium_src-11309735fce8bf91f70643e955c6153b79f40095.zip chromium_src-11309735fce8bf91f70643e955c6153b79f40095.tar.gz chromium_src-11309735fce8bf91f70643e955c6153b79f40095.tar.bz2 | |
New FFmpeg public API headers to match our source tarball in deps.
Review URL: http://codereview.chromium.org/113748
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16771 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/bench')
| -rw-r--r-- | media/bench/bench.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/bench/bench.cc b/media/bench/bench.cc index 42deacf..147b91a 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(); } |