diff options
| author | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-21 20:16:39 +0000 |
|---|---|---|
| committer | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-21 20:16:39 +0000 |
| commit | dc86c8b58bd613c139309c15693c1abd1118f51f (patch) | |
| tree | 5ec80f745b44f0621ad62b2a2664e031f43d42f4 /media/cdm | |
| parent | 65625a34e78e75abe728ee115e9cd97815e48ba8 (diff) | |
| download | chromium_src-dc86c8b58bd613c139309c15693c1abd1118f51f.zip chromium_src-dc86c8b58bd613c139309c15693c1abd1118f51f.tar.gz chromium_src-dc86c8b58bd613c139309c15693c1abd1118f51f.tar.bz2 | |
Revert 271945 "Roll FFmpeg for M37."
Broke gclient runhooks on Linux ChromiumOS Builder on Blink waterfall.
Bugs 119020 and 236611 will be updated with details.
> Roll FFmpeg for M37.
>
> Syncs to head as of bebce653e5601ceafa004db0eb6b2c7d4d16f0c0. The
> roll requires us to stop using some deprecated features:
> - Replaces av_get_frame_defaults() with av_frame_unref() per docs.
> - Switches FFmpegVideoDecoder to use ref-counted frames.
> - Removes error concealment settings and disables error resilience
> for all platforms except ChromeOS (since it's required for mpeg4).
>
> Avoiding these also allows us to disable some deprecated features
> wholesale via #defines.
>
> BUG=119020,236611
> TEST=all tests (and regression tests) pass under asan
> NOTRY=true
> R=jrummell@chromium.org, wolenetz@chromium.org
>
> Review URL: https://codereview.chromium.org/286953005
TBR=dalecurtis@google.com
Review URL: https://codereview.chromium.org/296483012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271956 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/cdm')
| -rw-r--r-- | media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.cc | 2 | ||||
| -rw-r--r-- | media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.cc b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.cc index c35b178..012aaf5 100644 --- a/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.cc +++ b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.cc @@ -271,7 +271,7 @@ cdm::Status FFmpegCdmAudioDecoder::DecodeBuffer( // skipping end of stream packets since they have a size of zero. do { // Reset frame to default values. - av_frame_unref(av_frame_.get()); + avcodec_get_frame_defaults(av_frame_.get()); int frame_decoded = 0; int result = avcodec_decode_audio4( diff --git a/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.cc b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.cc index 942dce1..320362f 100644 --- a/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.cc +++ b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.cc @@ -226,7 +226,7 @@ cdm::Status FFmpegCdmVideoDecoder::DecodeFrame( codec_context_->reordered_opaque = timestamp; // Reset frame to default values. - av_frame_unref(av_frame_.get()); + avcodec_get_frame_defaults(av_frame_.get()); // This is for codecs not using get_buffer to initialize // |av_frame_->reordered_opaque| |