projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Compiles; strange hang on adding content to a film.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_decoder.cc
diff --git
a/src/lib/ffmpeg_decoder.cc
b/src/lib/ffmpeg_decoder.cc
index 0e704bb1444577d9298afd7a7f1f39786d6b7ca3..d21a93e2926c2dc59c211dc28ea406f8a5e0078b 100644
(file)
--- a/
src/lib/ffmpeg_decoder.cc
+++ b/
src/lib/ffmpeg_decoder.cc
@@
-48,6
+48,7
@@
extern "C" {
#include "ffmpeg_decoder.h"
#include "filter_graph.h"
#include "subtitle.h"
#include "ffmpeg_decoder.h"
#include "filter_graph.h"
#include "subtitle.h"
+#include "audio_buffers.h"
#include "i18n.h"
#include "i18n.h"
@@
-219,8
+220,10
@@
FFmpegDecoder::setup_subtitle ()
bool
FFmpegDecoder::pass ()
{
bool
FFmpegDecoder::pass ()
{
-
int r = av_read_frame (_format_context, &_packet)
;
+
cout << "FFmpeg::pass\n"
;
+ int r = av_read_frame (_format_context, &_packet);
+
if (r < 0) {
if (r != AVERROR_EOF) {
/* Maybe we should fail here, but for now we'll just finish off instead */
if (r < 0) {
if (r != AVERROR_EOF) {
/* Maybe we should fail here, but for now we'll just finish off instead */