summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_decoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-12-15 19:54:10 +0000
committerCarl Hetherington <cth@carlh.net>2012-12-15 19:54:10 +0000
commitd95961e37e03f1060aa16cc0d6b0fe2fdbd4844d (patch)
treebe2976bdcdb2ed40c17ddf49d059aea2d46bf878 /src/lib/ffmpeg_decoder.cc
parent1f029ed4422007ded20358683fa5b1cbf4d870da (diff)
Small cleanup.
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
-rw-r--r--src/lib/ffmpeg_decoder.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 46e851e37..74eb8934c 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -101,11 +101,9 @@ FFmpegDecoder::~FFmpegDecoder ()
void
FFmpegDecoder::setup_general ()
{
- int r;
-
av_register_all ();
- if ((r = avformat_open_input (&_format_context, _film->content_path().c_str(), 0, 0)) != 0) {
+ if (avformat_open_input (&_format_context, _film->content_path().c_str(), 0, 0) < 0) {
throw OpenFileError (_film->content_path ());
}