Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/mpc-hc.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortetsuo55 <tetsuo55@users.sourceforge.net>2010-04-09 01:14:58 +0400
committertetsuo55 <tetsuo55@users.sourceforge.net>2010-04-09 01:14:58 +0400
commita9b7bf3fb3e1334d8defd05ca4cfae870b4912e5 (patch)
tree2dab453d94d5e003379a6cc895eceb84c80e23ec /src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/flvdec.c
parentaafd49a91f7c2fa9c7103971c16fa6e1b29e8bfd (diff)
astyle formatting cleanup to make the sourcecode more accessible
switch used: astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren http://astyle.sourceforge.net/ git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1783 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/flvdec.c')
-rw-r--r--src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/flvdec.c42
1 files changed, 26 insertions, 16 deletions
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/flvdec.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/flvdec.c
index 104e48d91..8eab4af1d 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/flvdec.c
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/flvdec.c
@@ -21,13 +21,17 @@
#include "h263.h"
#include "flv.h"
-void ff_flv2_decode_ac_esc(GetBitContext *gb, int *level, int *run, int *last){
+void ff_flv2_decode_ac_esc(GetBitContext *gb, int *level, int *run, int *last)
+{
int is11 = get_bits1(gb);
*last = get_bits1(gb);
*run = get_bits(gb, 6);
- if(is11){
+ if(is11)
+ {
*level = get_sbits(gb, 11);
- } else {
+ }
+ else
+ {
*level = get_sbits(gb, 7);
}
}
@@ -37,19 +41,22 @@ int ff_flv_decode_picture_header(MpegEncContext *s)
int format, width, height;
/* picture header */
- if (get_bits_long(&s->gb, 17) != 1) {
+ if(get_bits_long(&s->gb, 17) != 1)
+ {
av_log(s->avctx, AV_LOG_ERROR, "Bad picture start code\n");
return -1;
}
format = get_bits(&s->gb, 5);
- if (format != 0 && format != 1) {
+ if(format != 0 && format != 1)
+ {
av_log(s->avctx, AV_LOG_ERROR, "Bad picture format\n");
return -1;
}
- s->h263_flv = format+1;
+ s->h263_flv = format + 1;
s->picture_number = get_bits(&s->gb, 8); /* picture timestamp */
format = get_bits(&s->gb, 3);
- switch (format) {
+ switch(format)
+ {
case 0:
width = get_bits(&s->gb, 8);
height = get_bits(&s->gb, 8);
@@ -88,12 +95,12 @@ int ff_flv_decode_picture_header(MpegEncContext *s)
s->height = height;
s->pict_type = FF_I_TYPE + get_bits(&s->gb, 2);
- s->dropable= s->pict_type > FF_P_TYPE;
- if (s->dropable)
+ s->dropable = s->pict_type > FF_P_TYPE;
+ if(s->dropable)
s->pict_type = FF_P_TYPE;
skip_bits1(&s->gb); /* deblocking flag */
- s->chroma_qscale= s->qscale = get_bits(&s->gb, 5);
+ s->chroma_qscale = s->qscale = get_bits(&s->gb, 5);
s->h263_plus = 0;
@@ -101,23 +108,26 @@ int ff_flv_decode_picture_header(MpegEncContext *s)
s->h263_long_vectors = 0;
/* PEI */
- while (get_bits1(&s->gb) != 0) {
+ while(get_bits1(&s->gb) != 0)
+ {
skip_bits(&s->gb, 8);
}
s->f_code = 1;
- if(s->avctx->debug & FF_DEBUG_PICT_INFO){
+ if(s->avctx->debug & FF_DEBUG_PICT_INFO)
+ {
av_log(s->avctx, AV_LOG_DEBUG, "%c esc_type:%d, qp:%d num:%d\n",
- s->dropable ? 'D' : av_get_pict_type_char(s->pict_type), s->h263_flv-1, s->qscale, s->picture_number);
+ s->dropable ? 'D' : av_get_pict_type_char(s->pict_type), s->h263_flv - 1, s->qscale, s->picture_number);
}
- s->y_dc_scale_table=
- s->c_dc_scale_table= ff_mpeg1_dc_scale_table;
+ s->y_dc_scale_table =
+ s->c_dc_scale_table = ff_mpeg1_dc_scale_table;
return 0;
}
-AVCodec flv_decoder = {
+AVCodec flv_decoder =
+{
"flv",
CODEC_TYPE_VIDEO,
CODEC_ID_FLV1,