summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@sisveltech.com>2011-04-22 15:42:35 +0200
committerMartin Lambers <marlam@marlam.de>2011-04-22 15:42:35 +0200
commitcaeabc2ce403589a0fc91ef401e27a25979fc3e1 (patch)
tree6f628eb599ec5119b2ce456e8f863e0c820e0869
parent657e3dd98ec6dd8834b80cfb24746119415016a1 (diff)
downloadbino-caeabc2ce403589a0fc91ef401e27a25979fc3e1.tar.gz
Media object: replace obsolete libavformat constants.
-rw-r--r--src/media_object.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/media_object.cpp b/src/media_object.cpp
index d766713..bb611ef 100644
--- a/src/media_object.cpp
+++ b/src/media_object.cpp
@@ -664,7 +664,7 @@ void media_object::open(const std::string &url)
&& i < static_cast<unsigned int>(std::numeric_limits<int>::max()); i++)
{
_ffmpeg->format_ctx->streams[i]->discard = AVDISCARD_ALL; // ignore by default; user must activate streams
- if (_ffmpeg->format_ctx->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO)
+ if (_ffmpeg->format_ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO)
{
_ffmpeg->video_streams.push_back(i);
int j = _ffmpeg->video_streams.size() - 1;
@@ -732,7 +732,7 @@ void media_object::open(const std::string &url)
}
_ffmpeg->video_last_timestamps.push_back(std::numeric_limits<int64_t>::min());
}
- else if (_ffmpeg->format_ctx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO)
+ else if (_ffmpeg->format_ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
{
_ffmpeg->audio_streams.push_back(i);
int j = _ffmpeg->audio_streams.size() - 1;
@@ -764,7 +764,7 @@ void media_object::open(const std::string &url)
_ffmpeg->audio_buffers.push_back(std::vector<unsigned char>());
_ffmpeg->audio_last_timestamps.push_back(std::numeric_limits<int64_t>::min());
}
- else if (_ffmpeg->format_ctx->streams[i]->codec->codec_type == CODEC_TYPE_SUBTITLE)
+ else if (_ffmpeg->format_ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_SUBTITLE)
{
_ffmpeg->subtitle_streams.push_back(i);
int j = _ffmpeg->subtitle_streams.size() - 1;