summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-09-11 22:13:45 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-02 04:16:46 +0200
commit0feeb9a0009614a6e5b88edc899b1fef89e50d3a (patch)
tree1ccffc074ab6187611e1736162c75380f1abc4d6
parentbe67d71493c612bb385d68a0359edc4d7c4d8bbc (diff)
downloadmpv-0feeb9a0009614a6e5b88edc899b1fef89e50d3a.tar.bz2
mpv-0feeb9a0009614a6e5b88edc899b1fef89e50d3a.tar.xz
cosmetics: av_sub
cosmetics: Break some long lines. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32164 b3059339-0415-0410-9bf9-f77b7e298cf2 cosmetics: Add #endif comment. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32165 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--av_sub.c6
-rw-r--r--av_sub.h5
2 files changed, 7 insertions, 4 deletions
diff --git a/av_sub.c b/av_sub.c
index aadba94fd4..101f9a0291 100644
--- a/av_sub.c
+++ b/av_sub.c
@@ -35,7 +35,8 @@ void reset_avsub(struct sh_sub *sh)
* Decode a subtitle packet via libavcodec.
* \return < 0 on error, > 0 if further processing is needed
*/
-int decode_avsub(struct sh_sub *sh, uint8_t **data, int *size, double *pts, double *endpts)
+int decode_avsub(struct sh_sub *sh, uint8_t **data, int *size,
+ double *pts, double *endpts)
{
AVCodecContext *ctx = sh->context;
enum CodecID cid = CODEC_ID_NONE;
@@ -67,7 +68,8 @@ int decode_avsub(struct sh_sub *sh, uint8_t **data, int *size, double *pts, doub
ctx = avcodec_alloc_context();
sub_codec = avcodec_find_decoder(cid);
if (!ctx || !sub_codec || avcodec_open(ctx, sub_codec) < 0) {
- mp_msg(MSGT_SUBREADER, MSGL_FATAL, "Could not open subtitle decoder\n");
+ mp_msg(MSGT_SUBREADER, MSGL_FATAL,
+ "Could not open subtitle decoder\n");
av_freep(&ctx);
return -1;
}
diff --git a/av_sub.h b/av_sub.h
index 8713bd207e..690ed6c1f1 100644
--- a/av_sub.h
+++ b/av_sub.h
@@ -24,6 +24,7 @@
struct sh_sub;
void reset_avsub(struct sh_sub *sh);
-int decode_avsub(struct sh_sub *sh, uint8_t **data, int *size, double *pts, double *endpts);
+int decode_avsub(struct sh_sub *sh, uint8_t **data, int *size,
+ double *pts, double *endpts);
-#endif
+#endif /* MPLAYER_AV_SUB_H */