diff options
| author | Gwenole Beauchesne <gwenole.beauchesne@intel.com> | 2014-06-11 15:11:40 +0200 |
|---|---|---|
| committer | Gwenole Beauchesne <gwenole.beauchesne@intel.com> | 2014-06-12 10:26:26 +0200 |
| commit | db887f05cafdae8588150daeaa71bf99cfa3c6a2 (patch) | |
| tree | 315f4ac0c28014b0c9c0c1f4bb492fe78e4f618a /gst-libs/gst/codecparsers | |
| parent | 5196f241385f6b0a0b04794ac0048059d34ecdd8 (diff) | |
| download | gstreamer-plugins-bad-db887f05cafdae8588150daeaa71bf99cfa3c6a2.tar.gz | |
codecparsers: h264: fix quantization matrix conversion routine names.
Fix routine names for zigzag/raster scan order conversion routines for
quantization matrices. This ought to use the gst_h264_quant_matrix_*()
naming convention instead of gst_h264_video_quant_matrix_*(), which
derived from the MPEG-2 function names.
https://bugzilla.gnome.org/show_bug.cgi?id=731524
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Diffstat (limited to 'gst-libs/gst/codecparsers')
| -rw-r--r-- | gst-libs/gst/codecparsers/gsth264parser.c | 12 | ||||
| -rw-r--r-- | gst-libs/gst/codecparsers/gsth264parser.h | 16 |
2 files changed, 14 insertions, 14 deletions
diff --git a/gst-libs/gst/codecparsers/gsth264parser.c b/gst-libs/gst/codecparsers/gsth264parser.c index a4ae3a618..41489b88d 100644 --- a/gst-libs/gst/codecparsers/gsth264parser.c +++ b/gst-libs/gst/codecparsers/gsth264parser.c @@ -1777,7 +1777,7 @@ gst_h264_parser_parse_sei (GstH264NalParser * nalparser, GstH264NalUnit * nalu, } /** - * gst_h264_video_quant_matrix_8x8_get_zigzag_from_raster: + * gst_h264_quant_matrix_8x8_get_zigzag_from_raster: * @out_quant: (out): The resulting quantization matrix * @quant: The source quantization matrix * @@ -1790,7 +1790,7 @@ gst_h264_parser_parse_sei (GstH264NalParser * nalparser, GstH264NalUnit * nalu, * Since: 1.4 */ void -gst_h264_video_quant_matrix_8x8_get_zigzag_from_raster (guint8 out_quant[64], +gst_h264_quant_matrix_8x8_get_zigzag_from_raster (guint8 out_quant[64], const guint8 quant[64]) { guint i; @@ -1815,7 +1815,7 @@ gst_h264_video_quant_matrix_8x8_get_zigzag_from_raster (guint8 out_quant[64], * Since: 1.4 */ void -gst_h264_video_quant_matrix_8x8_get_raster_from_zigzag (guint8 out_quant[64], +gst_h264_quant_matrix_8x8_get_raster_from_zigzag (guint8 out_quant[64], const guint8 quant[64]) { guint i; @@ -1827,7 +1827,7 @@ gst_h264_video_quant_matrix_8x8_get_raster_from_zigzag (guint8 out_quant[64], } /** - * gst_h264_video_quant_matrix_4x4_get_zigzag_from_raster: + * gst_h264_quant_matrix_4x4_get_zigzag_from_raster: * @out_quant: (out): The resulting quantization matrix * @quant: The source quantization matrix * @@ -1840,7 +1840,7 @@ gst_h264_video_quant_matrix_8x8_get_raster_from_zigzag (guint8 out_quant[64], * Since: 1.4 */ void -gst_h264_video_quant_matrix_4x4_get_zigzag_from_raster (guint8 out_quant[16], +gst_h264_quant_matrix_4x4_get_zigzag_from_raster (guint8 out_quant[16], const guint8 quant[16]) { guint i; @@ -1865,7 +1865,7 @@ gst_h264_video_quant_matrix_4x4_get_zigzag_from_raster (guint8 out_quant[16], * Since: 1.4 */ void -gst_h264_video_quant_matrix_4x4_get_raster_from_zigzag (guint8 out_quant[16], +gst_h264_quant_matrix_4x4_get_raster_from_zigzag (guint8 out_quant[16], const guint8 quant[16]) { guint i; diff --git a/gst-libs/gst/codecparsers/gsth264parser.h b/gst-libs/gst/codecparsers/gsth264parser.h index 397d9a5e0..f9e5083eb 100644 --- a/gst-libs/gst/codecparsers/gsth264parser.h +++ b/gst-libs/gst/codecparsers/gsth264parser.h @@ -769,17 +769,17 @@ GstH264ParserResult gst_h264_parse_sps (GstH264NalUnit *nalu, GstH264ParserResult gst_h264_parse_pps (GstH264NalParser *nalparser, GstH264NalUnit *nalu, GstH264PPS *pps); -void gst_h264_video_quant_matrix_8x8_get_zigzag_from_raster (guint8 out_quant[64], - const guint8 quant[64]); +void gst_h264_quant_matrix_8x8_get_zigzag_from_raster (guint8 out_quant[64], + const guint8 quant[64]); -void gst_h264_video_quant_matrix_8x8_get_raster_from_zigzag (guint8 out_quant[64], - const guint8 quant[64]); +void gst_h264_quant_matrix_8x8_get_raster_from_zigzag (guint8 out_quant[64], + const guint8 quant[64]); -void gst_h264_video_quant_matrix_4x4_get_zigzag_from_raster (guint8 out_quant[16], - const guint8 quant[16]); +void gst_h264_quant_matrix_4x4_get_zigzag_from_raster (guint8 out_quant[16], + const guint8 quant[16]); -void gst_h264_video_quant_matrix_4x4_get_raster_from_zigzag (guint8 out_quant[16], - const guint8 quant[16]); +void gst_h264_quant_matrix_4x4_get_raster_from_zigzag (guint8 out_quant[16], + const guint8 quant[16]); void gst_h264_video_calculate_framerate (const GstH264SPS * sps, guint field_pic_flag, guint pic_struct, gint * fps_num, gint * fps_den); |