summaryrefslogtreecommitdiffstats
path: root/sub
diff options
context:
space:
mode:
authorwm4 <wm4@mplayer2.org>2012-03-05 22:24:57 +0100
committerwm4 <wm4@mplayer2.org>2012-03-05 22:24:57 +0100
commit8dc0743571630a08fd40fa88aa09b12b4ce65bf2 (patch)
treee1c4465768635d77954b5fd21ae726444ee4f48a /sub
parentaebdf4f153438497b9310bd1417b5216f07e043b (diff)
parentafecdb681bed81b5df0ed18a300c68be603dfdf9 (diff)
downloadmpv-8dc0743571630a08fd40fa88aa09b12b4ce65bf2.tar.bz2
mpv-8dc0743571630a08fd40fa88aa09b12b4ce65bf2.tar.xz
Merge remote-tracking branch 'origin/master' into my_master
Conflicts: mplayer.c screenshot.c
Diffstat (limited to 'sub')
-rw-r--r--sub/av_sub.c9
-rw-r--r--sub/spudec.c14
2 files changed, 15 insertions, 8 deletions
diff --git a/sub/av_sub.c b/sub/av_sub.c
index 0d8c14db60..3a9e1b4f26 100644
--- a/sub/av_sub.c
+++ b/sub/av_sub.c
@@ -63,9 +63,14 @@ int decode_avsub(struct sh_sub *sh, uint8_t *data, int size,
pkt.convergence_duration = duration * 1000;
if (!ctx) {
AVCodec *sub_codec;
- ctx = avcodec_alloc_context();
sub_codec = avcodec_find_decoder(cid);
- if (!ctx || !sub_codec || avcodec_open(ctx, sub_codec) < 0) {
+ if (!sub_codec)
+ goto error;
+ ctx = avcodec_alloc_context3(sub_codec);
+ if (!ctx)
+ goto error;
+ if (avcodec_open2(ctx, sub_codec, NULL) < 0) {
+ error:
mp_msg(MSGT_SUBREADER, MSGL_FATAL,
"Could not open subtitle decoder\n");
av_freep(&ctx);
diff --git a/sub/spudec.c b/sub/spudec.c
index 48e219a930..a871aa3cd9 100644
--- a/sub/spudec.c
+++ b/sub/spudec.c
@@ -27,9 +27,6 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "config.h"
-#include "mp_msg.h"
-
#include <errno.h>
#include <limits.h>
#include <stdio.h>
@@ -37,12 +34,17 @@
#include <unistd.h>
#include <string.h>
#include <math.h>
+
+#include <libavutil/avutil.h>
+#include <libavutil/intreadwrite.h>
+#include <libswscale/swscale.h>
+
+#include "config.h"
+#include "mp_msg.h"
+
#include "libvo/video_out.h"
#include "spudec.h"
#include "vobsub.h"
-#include "libavutil/avutil.h"
-#include "ffmpeg_files/intreadwrite.h"
-#include "libswscale/swscale.h"
#include "mpcommon.h"
/* Valid values for spu_aamode: