summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaromil <jaromil@dyne.org>2013-03-06 16:25:15 (GMT)
committer Jaromil <jaromil@dyne.org>2013-03-06 16:39:40 (GMT)
commit827cae487e1accead41135451e9e27b5a5b12450 (patch)
treedb90ab5288d48efbe01f4d75eb1acd5ca3a9848c
parentb5c2a3d3c946d4e2dcfa878229d599a43493e384 (diff)
ffmpeg api update <http://bugs.dyne.org/view.php?id=342>
-rw-r--r--src/ffmpeg_encoder.cpp2
-rw-r--r--src/video_layer.cpp11
2 files changed, 7 insertions, 6 deletions
diff --git a/src/ffmpeg_encoder.cpp b/src/ffmpeg_encoder.cpp
index 5c779e1..6475a86 100644
--- a/src/ffmpeg_encoder.cpp
+++ b/src/ffmpeg_encoder.cpp
@@ -277,7 +277,7 @@ void FFmpegEncoder::set_encoding_parameter() {
acc->codec_id=CODEC_ID_MPEG2VIDEO;
- acc->codec_type = CODEC_TYPE_VIDEO;
+ acc->codec_type = AVMEDIA_TYPE_VIDEO;
/* sample parameters */
acc->bit_rate = 2000000;
diff --git a/src/video_layer.cpp b/src/video_layer.cpp
index adf663c..0d30d09 100644
--- a/src/video_layer.cpp
+++ b/src/video_layer.cpp
@@ -216,7 +216,8 @@ bool VideoLayer::open(const char *file) {
/**
* Here we look for a video stream
*/
- case CODEC_TYPE_VIDEO:
+// case CODEC_TYPE_VIDEO: // old FFMPEG
+ case AVMEDIA_TYPE_VIDEO:
// enc->flags |= CODEC_FLAG_LOOP_FILTER;
video_index = i;
video_codec_ctx = enc;
@@ -260,7 +261,7 @@ bool VideoLayer::open(const char *file) {
break; // //////////////// end of video section
- case CODEC_TYPE_AUDIO:
+ case AVMEDIA_TYPE_AUDIO:
audio_index = i;
audio_codec_ctx = enc;
func ("VideoLayer :: audio id=%i", audio_index);
@@ -290,13 +291,13 @@ bool VideoLayer::open(const char *file) {
break; // /////// end of audio section
- case CODEC_TYPE_SUBTITLE:
+ case AVMEDIA_TYPE_SUBTITLE:
act("stream has also subtitles");
break;
- case CODEC_TYPE_ATTACHMENT:
+ case AVMEDIA_TYPE_ATTACHMENT:
act("stream has also attachment");
break;
- case CODEC_TYPE_DATA:
+ case AVMEDIA_TYPE_DATA:
act("stream has also a data carrier");
break;
default: