Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libdirac/libschroedinger: Drop unnecessary symbol prefixes.
  cmdutils: check fread() return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 14 insertions, 14 deletions

diff --git a/libavcodec/libdirac_libschro.h b/libavcodec/libdirac_libschro.h
index 3d63f977cf..aecdb30e76 100644
--- a/libavcodec/libdirac_libschro.h
+++ b/libavcodec/libdirac_libschro.h
@@ -33,7 +33,7 @@ typedef struct {
     uint16_t height;
     uint16_t frame_rate_num;
     uint16_t frame_rate_denom;
-} FfmpegDiracSchroVideoFormatInfo;
+} DiracSchroVideoFormatInfo;
 
 /**
 * Returns the index into the Dirac Schro common video format info table
@@ -43,7 +43,7 @@ unsigned int ff_dirac_schro_get_video_format_idx(AVCodecContext *avccontext);
 /**
 * contains a single encoded frame returned from Dirac or Schroedinger
 */
-typedef struct FfmpegDiracSchroEncodedFrame {
+typedef struct DiracSchroEncodedFrame {
     /** encoded frame data */
     uint8_t *p_encbuf;
 
@@ -55,51 +55,51 @@ typedef struct FfmpegDiracSchroEncodedFrame {
 
     /** key frame flag. 1 : is key frame , 0 : in not key frame */
     uint16_t key_frame;
-} FfmpegDiracSchroEncodedFrame;
+} DiracSchroEncodedFrame;
 
 /**
 * queue element
 */
-typedef struct FfmpegDiracSchroQueueElement {
+typedef struct DiracSchroQueueElement {
     /** Data to be stored in queue*/
     void *data;
     /** Pointer to next element queue */
-    struct FfmpegDiracSchroQueueElement *next;
-} FfmpegDiracSchroQueueElement;
+    struct DiracSchroQueueElement *next;
+} DiracSchroQueueElement;
 
 
 /**
 * A simple queue implementation used in libdirac and libschroedinger
 */
-typedef struct FfmpegDiracSchroQueue {
+typedef struct DiracSchroQueue {
     /** Pointer to head of queue */
-    FfmpegDiracSchroQueueElement *p_head;
+    DiracSchroQueueElement *p_head;
     /** Pointer to tail of queue */
-    FfmpegDiracSchroQueueElement *p_tail;
+    DiracSchroQueueElement *p_tail;
     /** Queue size*/
     int size;
-} FfmpegDiracSchroQueue;
+} DiracSchroQueue;
 
 /**
 * Initialise the queue
 */
-void ff_dirac_schro_queue_init(FfmpegDiracSchroQueue *queue);
+void ff_dirac_schro_queue_init(DiracSchroQueue *queue);
 
 /**
 * Add an element to the end of the queue
 */
-int ff_dirac_schro_queue_push_back(FfmpegDiracSchroQueue *queue, void *p_data);
+int ff_dirac_schro_queue_push_back(DiracSchroQueue *queue, void *p_data);
 
 /**
 * Return the first element in the queue
 */
-void *ff_dirac_schro_queue_pop(FfmpegDiracSchroQueue *queue);
+void *ff_dirac_schro_queue_pop(DiracSchroQueue *queue);
 
 /**
 * Free the queue resources. free_func is a function supplied by the caller to
 * free any resources allocated by the caller. The data field of the queue
 * element is passed to it.
 */
-void ff_dirac_schro_queue_free(FfmpegDiracSchroQueue *queue,
+void ff_dirac_schro_queue_free(DiracSchroQueue *queue,
                                void (*free_func)(void *));
 #endif /* AVCODEC_LIBDIRAC_LIBSCHRO_H */