diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-01-09 23:50:21 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-01-09 23:50:21 +0000 |
| commit | 49f7b473b0446811f8e1f61ae0b88ec0e0b5328a (patch) | |
| tree | 53a028171c067e087a3360a1bb1710785a796fe4 /src | |
| parent | e28def57ff4591f02ca3585a506ea58fbeba5d46 (diff) | |
Remove some deprecated FFmpeg stuff.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/ffmpeg.cc | 4 | ||||
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 4 | ||||
| -rw-r--r-- | src/lib/ffmpeg_examiner.cc | 1 |
3 files changed, 2 insertions, 7 deletions
diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc index e5e5f317a..d3653e311 100644 --- a/src/lib/ffmpeg.cc +++ b/src/lib/ffmpeg.cc @@ -62,7 +62,7 @@ FFmpeg::~FFmpeg () } } - avcodec_free_frame (&_frame); + av_frame_free (&_frame); avformat_close_input (&_format_context); } @@ -136,7 +136,7 @@ FFmpeg::setup_general () } } - _frame = avcodec_alloc_frame (); + _frame = av_frame_alloc (); if (_frame == 0) { throw DecodeError (N_("could not allocate frame")); } diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index d9b779659..b672b2c1f 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -167,8 +167,6 @@ FFmpegDecoder::pass () return; } - avcodec_get_frame_defaults (_frame); - shared_ptr<const Film> film = _film.lock (); assert (film); @@ -345,8 +343,6 @@ FFmpegDecoder::seek (VideoContent::Frame frame, bool accurate) continue; } - avcodec_get_frame_defaults (_frame); - int finished = 0; r = avcodec_decode_video2 (video_codec_context(), _frame, &finished, &_packet); if (r >= 0 && finished) { diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc index 78b6e3121..a63090d12 100644 --- a/src/lib/ffmpeg_examiner.cc +++ b/src/lib/ffmpeg_examiner.cc @@ -70,7 +70,6 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c) } int frame_finished; - avcodec_get_frame_defaults (_frame); AVCodecContext* context = _format_context->streams[_packet.stream_index]->codec; |