projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hand-apply 2ee558ec90623b570360e8e55c918b5bb37f9aac from master; various snapping...
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_decoder.h
diff --git
a/src/lib/ffmpeg_decoder.h
b/src/lib/ffmpeg_decoder.h
index 9f85c2dca8e5e2d9fc66045cd694dab07c12fb90..0334a30e203f4064d8ef4d0ea788eb38d0a2ef2a 100644
(file)
--- a/
src/lib/ffmpeg_decoder.h
+++ b/
src/lib/ffmpeg_decoder.h
@@
-21,25
+21,25
@@
* @brief A decoder using FFmpeg to decode content.
*/
* @brief A decoder using FFmpeg to decode content.
*/
-#include <vector>
-#include <string>
-#include <stdint.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/optional.hpp>
-#include <boost/thread/mutex.hpp>
-extern "C" {
-#include <libavcodec/avcodec.h>
-}
#include "util.h"
#include "decoder.h"
#include "video_decoder.h"
#include "audio_decoder.h"
#include "subtitle_decoder.h"
#include "ffmpeg.h"
#include "util.h"
#include "decoder.h"
#include "video_decoder.h"
#include "audio_decoder.h"
#include "subtitle_decoder.h"
#include "ffmpeg.h"
+extern "C" {
+#include <libavcodec/avcodec.h>
+}
+#include <boost/shared_ptr.hpp>
+#include <boost/optional.hpp>
+#include <boost/thread/mutex.hpp>
+#include <stdint.h>
+#include <vector>
+#include <string>
class Log;
class FilterGraph;
class Log;
class FilterGraph;
-
class
ffmpeg_pts_offset_test;
+
struct
ffmpeg_pts_offset_test;
/** @class FFmpegDecoder
* @brief A decoder using FFmpeg to decode content.
/** @class FFmpegDecoder
* @brief A decoder using FFmpeg to decode content.